Jon Schewe wrote: > I've found that once I merge changes from my development branch into > trunk, then merge someone else's changes from their development branch > into trunk then I try and merge the trunk back into my branch I need to > use "svnmerge merge -b", otherwise I get conflicts. Does this seem > correct?
You have to use -b -- note that the other person's changes on their development branch has nothing to do with it. You would have to use -b in this case even if the only two branches were yours and the trunk. Cheers, Raman Gupta _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
