merge-conflicts

Incremental merge for git

• Updated
• Python

merge Xcode project file is so easy

• Updated
• Python

A vim plugin to perform diffs on blocks of code

• Updated
• Vim Script

Resolve git merge conflicts in Atom

• Updated
• CoffeeScript

🍰 Efficient way of using Vim as a Git mergetool

• Updated
• Vim Script

Learn why conflicts happen and how to resolve them.

• Updated

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

• Updated
• PHP

rizzler: stop crying over Git merge conflicts and let AI handle the drama

• Updated
• Rust

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

• Updated
• Shell

Avoid merge conflicts across git worktrees for parallel AI coding agents

• Updated
• Rust

Better merge conflict support for vscode

• Updated
• TypeScript

Agent coordination protocol — declare intents, lock symbols, detect conflicts before code is written

• Updated
• TypeScript

A Github action for finding merge conflicts

• Updated
• Shell

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
• Swift

An extract, as complete as I can make it, of content from the revctrl.org wiki

• Updated
• Python

Formation complète sur Git, du débutant à l'expert. Guide structuré en 10 modules couvrant les fondamentaux, branches, GitHub, fonctionnalités avancées, workflows professionnels et bonnes pratiques.

• Updated

Git and GitHub Crash Course 2023 - اقوى دورة تعلم جيت و جيت هاب

• Updated

A Vim9.1 plugin for managing three-way merges; pure vim9script.

• Updated
• Vim Script

Merganser is a scalable and extendable tool for analyzing merge scenarios in git repositories

• Updated
• Python

📬A tool to split up a Postman collection into files. One file per request.

• Updated
• TypeScript