September 11, 2019 • ☕️ 1 min read
Conflicts in git will happen. In some cases, they are unavoidable.
Here is a one line command that can be ran at the root of the repository that will open all files with merge conflicts in VS Code.
git diff --name-only | uniq | xargs code
This command is does 3 things:
--name-only, that have conflicts
I’ve aliased this to
git.fix for ease of use during those pesky conflict resolutions.