Resolve Merge Conflicts
Resolving Conflicts with CodeBot
CodeBot can help you solve merge conflicts.
CodeBot will look at the details of all conflicted files and have optional access to other files involved in the merge (including those that resolved successfully), for context. Based on this information, it will try to resolve the merge conflicts and show you a summary of its suggestions for you to accept, tweak, or reject:
See Resolving Merge Conflicts with CodeBot for more details.
