bug-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS can't recognize identical changes when merging

From: Stephen Rasku
Subject: CVS can't recognize identical changes when merging
Date: Fri, 12 Jan 2001 13:04:18 -0800 (PST) 
Found on CVS 1.10.8

If make a branch tag on a file and then make the identical change on 
the branch and on the trunk and then try to merge from the branch to 
the trunk you will get conflicts.  CVS should recognize that the 
conflicts are identical and just keep one copy.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]