Today, we had a conflict when merging the jboss stabilization branch into the RC. Here are the steps I used to resolve it. The basic process was to first merge the RC into the jboss-stabilization branch, resolve the conflict and then merge the jboss-stabilization branch back into the RC:
552 svn co http://halsvn01/svn/hal/branches/features/jboss-stabilization
553 svn status
554 cd jboss-stabilization/
555 svn status
556 svn info
557 svn merge http://halsvn01/svn/hal/branches/RC/12.11-RC
558 svn status
559 svn resolve --accept=working halwebsite/com
560 svn status
561 svn commit -m "Sync jboss-stabilization branch with 12.11-RC"
562 ls
563 cd ..
564 rm -rf jboss-stabilization/
565 svn co http://halsvn01/svn/hal/branches/RC/12.11-RC
566 cd 12.11-RC/
567 svn merge --reintegrate http://halsvn01/svn/hal/branches/features/jboss-stabilization
568 svn status
-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com
-------------------------------------