merge-conflicts
Here are 42 public repositories matching this topic...
merge Xcode project file is so easy
-
Updated
Mar 5, 2024 - Python
Learn why conflicts happen and how to resolve them.
-
Updated
Mar 25, 2024
Resolve git merge conflicts in Atom
-
Updated
May 16, 2017 - CoffeeScript
A vim plugin to perform diffs on blocks of code
-
Updated
Apr 22, 2024 - Vim Script
🍰 Efficient way of using Vim as a Git mergetool
-
Updated
Sep 7, 2020 - Vim Script
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
-
Updated
Aug 29, 2022 - Shell
A Github action for finding merge conflicts
-
Updated
Oct 26, 2022 - Shell
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
-
Updated
Mar 12, 2023 - PHP
Better merge conflict support for vscode
-
Updated
Aug 28, 2017 - TypeScript
An extract, as complete as I can make it, of content from the revctrl.org wiki
-
Updated
Oct 14, 2021 - Python
Simplified Subversion command-line workflow
-
Updated
Apr 24, 2024 - PHP
Resolve conflicts via version space algebra in structured merge.
-
Updated
Nov 10, 2018 - Java
📬A tool to split up a Postman collection into files. One file per request.
-
Updated
May 23, 2019 - TypeScript
Merganser is a scalable and extendable tool for analyzing merge scenarios in git repositories
-
Updated
May 6, 2021 - Python
Resolving conflict merges with ASTs
-
Updated
Mar 18, 2017 - Java
An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.
-
Updated
Mar 10, 2018 - Swift
Settle your merge conflicts from Neovim
-
Updated
Aug 5, 2022 - Lua
Code Challenge: dealing with projects that suffer from code drift
-
Updated
Sep 3, 2023 - Python
Improve this page
Add a description, image, and links to the merge-conflicts topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the merge-conflicts topic, visit your repo's landing page and select "manage topics."