Merge Conflict Resolver using IBM BOB
Merge conflicts are one of the most tedious parts of working on a shared codebase. Someone has to stop what they're doing, open the file, figure out what each side of the conflict was trying to do, and manually stitch together a fix.