merge-conflict

There are 2 repositories under merge-conflict topic.

• resolve-merge-conflicts

  skills / resolve-merge-conflicts

  Learn why conflicts happen and how to resolve them.

  gitgithubmerge-conflictsmerge-conflictskills-course
  130

• balbuf / composer-git-merge-driver

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

  composergitcomposer-jsongit-mergegit-mergercomposer-lockmergemerge-conflictmerge-conflicts
  Language:PHP 124

• bzdgn / git-tutorial

  Git tutorial with command line

  gitgithubgit-tutorialmergemerge-conflictrevertgit-revertgit-mergerebasegit-rebasesquashgit-squash
  6

• wanadev / changelogify

  A basic changelog manager made to avoid conflicts at git merge

  avoid-conflictschangelogchangelog-generatormerge-conflictnpm
  Language:JavaScript 6

• hlovdal / git-resolve-conflict-using-kdiff3

  Script to help launch KDiff3 with all parent versions for conflicted files

  gitkdiff3merge-conflict
  Language:Perl 1

• Mahdi-Rahmani / git-exercise

  Github exercise of web programming course

  amendgitgitignoremerge-conflict
  Language:Shell 1

• mclaughlinconnor / haxe-ij-merge

  A port of IntelliJ's diff merging algorithm to Haxe

  conflict-resolutiongithaxemerge-conflict
  Language:Haxe 1

• neninja / exemplo_vim-merge-conflict

  Demonstração da resolução de conflitos git com Vim/Neovim

  merge-conflictmerge-conflictsmerge-toolnvimvimvimdiff
  0

• mohayemin / parallel-refactoring-analysis

  An Empirical Study of Parallel Refactorings in Merge Conflicts

  refactoringmerge-conflictgit
  Language:Java

• TobseF / kochamer

  🛠 A merge changelog Kotlin script

  gitkotlinmerge-conflict
  Language:Kotlin