Learn why conflicts happen and how to resolve them.
-
Updated
Mar 25, 2024
#
merge-conflict
Here are 10 public repositories matching this topic...
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
-
Updated
Mar 12, 2023 - PHP
Git tutorial with command line
github
git
merge
git-rebase
squash
rebase
git-tutorial
revert
git-merge
merge-conflict
git-revert
git-squash
-
Updated
Apr 30, 2024
A basic changelog manager made to avoid conflicts at git merge
-
Updated
Jul 26, 2023 - JavaScript
A port of IntelliJ's diff merging algorithm to Haxe
-
Updated
Sep 10, 2024 - Haxe
Script to help launch KDiff3 with all parent versions for conflicted files
-
Updated
Dec 1, 2022 - Perl
Github exercise of web programming course
-
Updated
Nov 21, 2022 - Shell
An Empirical Study of Parallel Refactorings in Merge Conflicts
-
Updated
Dec 12, 2020 - Java
Demonstração da resolução de conflitos git com Vim/Neovim
-
Updated
Oct 25, 2024
Improve this page
Add a description, image, and links to the merge-conflict topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the merge-conflict topic, visit your repo's landing page and select "manage topics."