TortoiseMerge is a tool for easily apply patches.
TortoiseMerge helps you with both those tasks:
• Reviewing patches
• Applying the patches
If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you.
TortoiseMerge has several different uses:
• Viewing the difference between two files and merging changes into one of them, or removing unwanted
changes.
• Editing conflicts between local changes and changes in the Subversion repository following an update.
• Applying patch files. This is the reason TortoiseMerge was created :)
No comments:
Post a Comment