>--- Forwarded mail from [EMAIL PROTECTED] >> At 4:07 AM -0500 2/12/04, m0llbuz_ wrote: >> >I also get weird conflicts during merges where the diffs are exactly the same. >> > >> ><<<<< foo.pm >> >foo >> >===== >> >foo >> >>>>>> 1.2.2.1 >> >> I've seen this too. Are there white space differences? Or were the >> two lines adde in different branches? Or are you doing multiple >> merges from the base of a branch (without a bookmark)?
>I have examined the diffs closely and no white spaces differ. In one example >there were no white spaces at all, like in the above example. No carriage >returns. This is typical when a merge has been repeated between two branches, and the diff was migrated during an earlier merge. To avoid this, pick a common ancestor after the first merge. We've discussed this recently in this forum; tag the results of every merge and use these tags to identify the common ancestor for the next merge. >--- End of forwarded message from [EMAIL PROTECTED] _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
