On Fri, Aug 17, 2007 at 12:59:05PM -0500, 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?
Yes -- for anything beyond the most basic unidirectional merge, you'll
need --bidirectional.
Dustin
--
Dustin J. Mitchell
Storage Software Engineer, Zmanda, Inc.
http://www.zmanda.com/
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
