Discussion on: How To Avoid Merge Conflicts

bormod profile image
Boris Modylevsky

I agree that conflicts can be a nightmare. From my experience most of the conflicts can be resolved automatically using proper diff and merge tool. I use SementucMerge which understands the changes and provides automatic merge if possible.