Topic: "merge-conflict"
skills/resolve-merge-conflicts
Learn why conflicts happen and how to resolve them.
Size: 54.7 KB - Last synced at: 12 days ago - Pushed at: about 1 year ago - Stars: 172 - Forks: 125
balbuf/composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
Language: PHP - Size: 23.4 KB - Last synced at: 6 days ago - Pushed at: about 2 years ago - Stars: 130 - Forks: 7
bzdgn/git-tutorial
Git tutorial with command line
Size: 349 KB - Last synced at: about 2 months ago - Pushed at: about 1 year ago - Stars: 8 - Forks: 3
akashdip2001/git-github
All important commands using in git-GitHub || solve merge conflict between Vs-Code & GitHub-web-editor
Language: HTML - Size: 5.18 MB - Last synced at: 14 days ago - Pushed at: 14 days ago - Stars: 7 - Forks: 2
wanadev/changelogify
A basic changelog manager made to avoid conflicts at git merge
Language: JavaScript - Size: 91.8 KB - Last synced at: 14 days ago - Pushed at: 4 months ago - Stars: 6 - Forks: 4
mclaughlinconnor/haxe-ij-merge
A port of IntelliJ's diff merging algorithm to Haxe
Language: Haxe - Size: 288 KB - Last synced at: 9 months ago - Pushed at: 9 months ago - Stars: 1 - Forks: 0
hlovdal/git-resolve-conflict-using-kdiff3
Script to help launch KDiff3 with all parent versions for conflicted files
Language: Perl - Size: 125 KB - Last synced at: about 2 years ago - Pushed at: over 2 years ago - Stars: 1 - Forks: 0
Mahdi-Rahmani/git-exercise
Github exercise of web programming course
Language: Shell - Size: 10.7 KB - Last synced at: over 1 year ago - Pushed at: over 2 years ago - Stars: 1 - Forks: 0
emmanseete/skills.resolve-merge-conflicts
Learn why conflicts happen and how to resolve them.
Size: 19.5 KB - Last synced at: 15 days ago - Pushed at: 5 months ago - Stars: 0 - Forks: 0
neninja/exemplo_vim-merge-conflict
Demonstração da resolução de conflitos git com Vim/Neovim
Size: 34.2 KB - Last synced at: about 1 year ago - Pushed at: about 1 year ago - Stars: 0 - Forks: 0
mohayemin/parallel-refactoring-analysis
An Empirical Study of Parallel Refactorings in Merge Conflicts
Language: Java - Size: 17 MB - Last synced at: about 2 years ago - Pushed at: over 4 years ago - Stars: 0 - Forks: 0
TobseF/kochamer
🛠 A merge changelog Kotlin script
Language: Kotlin - Size: 6.84 KB - Last synced at: 8 days ago - Pushed at: over 7 years ago - Stars: 0 - Forks: 0
