1 result found Sort:

jakub-g
git-resolve-conflict jakub-g
11
52
mit
3
:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
git git-mergetools merge-conflicts resolve-conflicts conflict-resolution conflicting-changes
Created 2016-08-24
46 commits to base branch, last one 2 years ago