Tuesday, July 12, 2016

TIP: edit files with Git merge conflicts

subl $(git diff --name-only --diff-filter=U)

This is even easier if you have a Git alias:

subl $(git unmerged)

In both cases it uses the Sublime text editor to open any file that has a Git merge conflict.

No comments:

Post a Comment