A plan for better source code diffs and merging

Previous | Next

By sanity
via blog.locut.us
Published: Dec 02 2008 / 06:48

Have you ever tried to merge two source trees, and wished that the merging algorithm could do a better job? In this short article I propose a simple approach to diffs and merges of source code that should be able to significantly improve upon today's merging algorithms.

Vote up

Vote down