How to programmatically merge text files with potential conflicts (ala git or svn, etc)?

Question

As part of a larger project, I want the ability to take two bodies of text and hand them to a merge algorithm which returns either an auto-merged result (in cases where the chan

Answer 1

Did you check out difflib

• http://docs.python.org/library/difflib.html

Answer 2

You're probably searching for merge algorithms like 3-way merging, which you can find in many open source projects, e.g. in the bazaar VCS (merge3.py source).