Merge Tool – don’t eat my closer

Another problem most other merge tools have is what I call “eat a closer”.

This screenshot is taken from running the test case 7) Avoiding “Eat a Closer” ( close.zip ).

The “eat a closer” problem is that many other merge tools will see the last line in each change (the </LI>) as matching instead of as part of each change.  So, if you’re not careful as you resolve the conflict, you can loose one of those lines.

Yet another little merge tool detail.  But, getting the details right can make all the difference.

Note: This same issue comes up in source code. The “closer” line in source code cases could be a line containing just a } for example.

Leave a Reply

Your email address will not be published.