6 results found Sort:
- Filter by Primary Language:
- Python (2)
- PHP (1)
- Shell (1)
- Vim Script (1)
- +
Incremental merge for git
Created
2013-05-01
563 commits to master branch, last one 3 years ago
merge Xcode project file is so easy
Created
2014-08-01
120 commits to master branch, last one 7 years ago
A vim plugin to perform diffs on blocks of code
Created
2011-08-11
131 commits to main branch, last one 7 months ago
Learn why conflicts happen and how to resolve them.
Created
2022-01-24
39 commits to main branch, last one 8 months ago
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
Created
2018-02-21
22 commits to master branch, last one 4 years ago
: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)
Created
2016-08-24
46 commits to base branch, last one 2 years ago