Ecosyste.ms: Repos
An open API service providing repository metadata for many open source software ecosystems.
GitHub topics: merge-conflict
skills/resolve-merge-conflicts
Learn why conflicts happen and how to resolve them.
Size: 54.7 KB - Last synced: 2 days ago - Pushed: 2 months ago - Stars: 127 - Forks: 95
neninja/exemplo_vim-merge-conflict
Demonstração da resolução de conflitos git com Vim/Neovim
Size: 34.2 KB - Last synced: 22 days ago - Pushed: 22 days ago - Stars: 0 - Forks: 0
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: 30 days ago - Pushed: about 1 year ago - Stars: 123 - Forks: 7
bzdgn/git-tutorial
Git tutorial with command line
Size: 349 KB - Last synced: 6 months ago - Pushed: over 3 years ago - Stars: 6 - Forks: 2
Mahdi-Rahmani/git-exercise
Github exercise of web programming course
Language: Shell - Size: 10.7 KB - Last synced: 8 months ago - Pushed: over 1 year ago - Stars: 1 - Forks: 0
TobseF/kochamer
🛠 A merge changelog Kotlin script
Language: Kotlin - Size: 6.84 KB - Last synced: 10 months ago - Pushed: over 6 years ago - Stars: 0 - 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: about 1 year ago - Pushed: over 1 year ago - Stars: 1 - Forks: 0
wanadev/changelogify
A basic changelog manager made to avoid conflicts at git merge
Language: JavaScript - Size: 129 KB - Last synced: 25 days ago - Pushed: 10 months ago - Stars: 6 - Forks: 4
mohayemin/parallel-refactoring-analysis
An Empirical Study of Parallel Refactorings in Merge Conflicts
Language: Java - Size: 17 MB - Last synced: about 1 year ago - Pushed: over 3 years ago - Stars: 0 - Forks: 0
