merge-conflicts

Incremental merge for git

merge Xcode project file is so easy

A vim plugin to perform diffs on blocks of code

Resolve git merge conflicts in Atom

🍰 Efficient way of using Vim as a Git mergetool

Learn why conflicts happen and how to resolve them.

The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.

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

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

Avoid merge conflicts across git worktrees for parallel AI coding agents

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

Better merge conflict support for vscode

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

A Zed fork with a git explorer and a graph you can check out, rebase, squash, and reset from (with undo), a merge conflict tab, in-editor PR review, peek-style Go to Definition, a live theme customizer, an Android/iOS device panel, multiple accounts per AI agent, terminals that move between windows, and an awaiting-input indicator.

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.

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

GitStudio — a JetBrains-grade Git experience for VS Code & Cursor

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