There are 1 repository under merge-conflicts topic.
A vim plugin to perform diffs on blocks of code
Resolve git merge conflicts in Atom
:cake: Efficient way of using Vim as a Git mergetool
Learn why conflicts happen and how to resolve them.
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Better merge conflict support for vscode
A Github action for finding merge conflicts
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.
An extract, as complete as I can make it, of content from the revctrl.org wiki
Merganser is a scalable and extendable tool for analyzing merge scenarios in git repositories
📬A tool to split up a Postman collection into files. One file per request.
Git and GitHub Crash Course 2023 - اقوى دورة تعلم جيت و جيت هاب
Github Action to automatically add a comment (and a label) to alert developers when there are merge conflicts
Simplified Subversion command-line workflow
Resolving conflict merges with ASTs
This repository contains materials for the final peer-review project/assignment. Course Instructor Steve Byrnes
Settle your merge conflicts from Neovim
Curbing Cumbersome Changelog Conflicts.
Replicates by automation the following three Git conflicts: 'content', 'add/add' and 'modify/delete'.
This repo is meant to further strengthen my knowledge of git and help me track changes, try new ideas in branches and collaborate easily.
Code Challenge: dealing with projects that suffer from code drift
Demonstração da resolução de conflitos git com Vim/Neovim
This is the sixth project in the second module in the Microverse program. It is an exercise for practicing Git merge conflicts with GitFlow workflow.
This repository is meant to demonstrate how merge conflicts may arise on group projects and how we can go about fixing them
@skills "Resolve merge conflicts"