All Categories → No Category → resolve-conflicts

Top 1 resolve-conflicts open source projects

git-resolve-conflict

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

✭ 44

shell git merge-conflicts conflict-resolution git-mergetools resolve-conflicts conflicting-changes

1-1 of 1 resolve-conflicts projects