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

Git tutorial with command line

A basic changelog manager made to avoid conflicts at git merge

VSCode extension to resolve Jupyter Notebook git merge conflicts

Let's learn how to use Git and Github

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

A port of IntelliJ's diff merging algorithm to Haxe

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

Github exercise of web programming course

Experiments with git rebase in trunk based development.

VSCode-style Git conflict resolution for Neovim

An Empirical Study of Parallel Refactorings in Merge Conflicts

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.

Practice repository for resolving Git merge conflicts with simple text files.

Practice repository for a course project on GitHub workflow: forks, branches, pull requests, merge conflicts, and squash commits.