VSCode-style diff, merge and git history for Neovim. Side-by-side or inline, with character-level highlighting from VSCode's own diff algorithm in C.

Easy terminal-native 3-way git mergetool vim-like workflow

Learn why conflicts happen and how to resolve them.

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

DevSecOps for the AI-era CI/CD pipeline. Catches the bugs your AI coding assistant introduces — before they reach production.

All important commands using in git-GitHub || solve merge conflict between Vs-Code & GitHub-web-editor

VSCode extension to resolve Jupyter Notebook git merge conflicts

AI-powered git conflict resolver that explains why each side changed before you resolve — not just another diff-and-pick tool.

Let's learn how to use Git and Github

Git tutorial with command line

A basic changelog manager made to avoid conflicts at git merge

🔄 Auto-sync GitHub fork repos with upstream. Resolve merge conflicts using AI agents (Claude Code, OpenCode, Codex). Desktop app.

A port of IntelliJ's diff merging algorithm to Haxe

Script to help launch KDiff3 with all parent versions for conflicted files

JetBrains-style three-pane visual merge conflict resolver for VS Code and Cursor, with optional AI that helps with conflicts.

Github exercise of web programming course

Experiments with git rebase in trunk based development.

A lightweight exploration into Resolve-merge-conflicts, branch handling, and version flow ✨ Featuring hands-on experiments with 🌿 branch variations, 💥 conflicting edits, 🛠️ manual conflict fixing, and 🔗 clean merges — all designed to understand how Git behaves when things get messy, and how to bring everything back together smoothly 🐙💛

Collaborative lab project practicing Git & GitHub workflows — cloning, committing, pushing, resolving merge conflicts, and team collaboration as part of the SoftUni Git and GitHub Lab.

Binary releases for gfix -- the cross-agent MCP-native merge resolver.