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?
________________________________________________________________________ Jon Schewe | http://www.mtu.net/~jpschewe If you see an attachment named signature.asc, this is my digital signature. See http://www.gnupg.org for more information. For I am convinced that neither death nor life, neither angels nor demons, neither the present nor the future, nor any powers, neither height nor depth, nor anything else in all creation, will be able to separate us from the love of God that is in Christ Jesus our Lord. - Romans 8:38-39 _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
