Do you hate all those >>>>>, =====, and <<<<< things that Git puts in your files during a merge conflict? If so, using a merge tool might be what you're after. A merge tool will give you a graphical ...
Some results have been hidden because they may be inaccessible to you
Show inaccessible results