RE: Merging change sets for a production release,
From: Andrew Reedick <Andrew.Reedick_at_cbeyond.net>
Date: Mon, 3 Jun 2013 16:08:20 -0400
> -----Original Message-----
Yes, I would try the 'svn merge -c ...' "changed" merge again.
Assuming you're using SVN 1.7, "chained" merges should be much easier. It is still an iterative process, in that if a merge conflict is encountered, svn will prompt you for what to do, then you fix the code, resolve the conflict, and re-run the merge command to pick up where it left off. You will probably want to use 'svn merge --accept postpone ...' to avoid the prompting. It's normally a good idea to save off your merge command so you can add it to the commit comment (or in case anything happens to your command line's history buffer.)
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.