|
|
|
|
|
|
by wscott
915 days ago
|
|
|
BitKeeper was able to merge that successfully by looking at the revision history and seeing that the changes involved just those lines. If one of them added a line between the two being changed then it would still be a conflict. I spent a year looking at interesting merges (and commits fixing bad merges) in the Linux kernel and making a catalog of interesting cases before writing 'smerge' for BitKeeper. It is impossible to make a perfect merge tool, but we can do a lot better than diff3. |
|
|