After a git conflict you’ll address the required changes and then
need to run git add <path/to/conflicted/file>
.
This saves you time, by letting you just run git add-conflicted
in order to add
all of them.
USAGE: git add-conflicted
Adds any unmerged (conflicting) files to the index.
Metadata:
Tags: