merge-conflict

There are 10 repositories under merge-conflict topic.

skills/resolve-merge-conflicts
Learn why conflicts happen and how to resolve them.
136 11 11100
balbuf/composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
Language:PHP124 8 97
bzdgn/git-tutorial
Git tutorial with command line
7 2 03
wanadev/changelogify
A basic changelog manager made to avoid conflicts at git merge
Language:JavaScript6 8 214
hlovdal/git-resolve-conflict-using-kdiff3
Script to help launch KDiff3 with all parent versions for conflicted files
Language:Perl1 1 00
Mahdi-Rahmani/git-exercise
Github exercise of web programming course
Language:Shell1 1 0
mclaughlinconnor/haxe-ij-merge
A port of IntelliJ's diff merging algorithm to Haxe
Language:Haxe1 1 00
neninja/exemplo_vim-merge-conflict
Demonstração da resolução de conflitos git com Vim/Neovim
0 1 00
mohayemin/parallel-refactoring-analysis
An Empirical Study of Parallel Refactorings in Merge Conflicts
Language:Java1 0
TobseF/kochamer
🛠 A merge changelog Kotlin script
Language:Kotlin2 0