Search Results - RepositoryStats

git-imerge mhagger

125

2.7k

gpl-2.0

53

Incremental merge for git

git python merge-conflicts

Created 2013-05-01

563 commits to master branch, last one 3 years ago

xUnique truebit

118

1.5k

other

48

merge Xcode project file is so easy

xcode python merge-conflicts xcode-project-file

Created 2014-08-01

120 commits to master branch, last one 7 years ago

linediff.vim AndrewRadev

26

456

mit

14

A vim plugin to perform diffs on blocks of code

vim diff refactoring merge-conflicts

Created 2011-08-11

131 commits to main branch, last one 2 months ago

resolve-merge-conflicts skills

97

127

mit

10

Learn why conflicts happen and how to resolve them.

git github skills-course merge-conflict merge-conflicts

Created 2022-01-24

39 commits to main branch, last one 3 months ago

composer-git-merge-driver balbuf

7

123

unknown

8

Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files

git merge composer git-merge git-merger composer-json composer-lock merge-conflict merge-conflicts

Created 2018-02-21

22 commits to master branch, last one 4 years ago

git-resolve-conflict jakub-g

11

51

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