sync merge process in SVN

10.96.82.195
srv-ind-ria2w\cafuser
c@fuser123


\\srv-ind-caf2.opentext.net\jenkins\caf-wip-sync-merge\caf-wip

srv-ind-caf2
root
support

cd /jenkins/workspace/caf-wip-sync-merge/caf-wip/

svn status | grep -P '^(?=.{0,6}C)' > /jenkins/workspace/caf-wip-sync-merge/conflicts.txt

Go to the respective component and resolve conflicts

Property conflicts: Resolve with local property

svn resolve -R --accept theirs-full /jenkins/workspace/caf-wip-sync-merge/caf-wip/components/cws/modelers

svn status --no-ignore | grep '^\?' | sed 's/^\?      //'

svn up

svn commit -F /jenkins/workspace/caf-wip-sync-merge/slavetools/merge-helper/mycomment.txt