https://github.com/renswickd/merge-conflict-explore
One-stop repo to understand git conflict with hands-on tutorials
https://github.com/renswickd/merge-conflict-explore
git git-commands git-merge git-merge-conflicts
Last synced: 2 months ago
JSON representation
One-stop repo to understand git conflict with hands-on tutorials
- Host: GitHub
- URL: https://github.com/renswickd/merge-conflict-explore
- Owner: renswickd
- Created: 2025-12-04T08:43:13.000Z (7 months ago)
- Default Branch: main
- Last Pushed: 2026-04-08T04:42:53.000Z (3 months ago)
- Last Synced: 2026-04-08T06:25:25.268Z (3 months ago)
- Topics: git, git-commands, git-merge, git-merge-conflicts
- Homepage:
- Size: 73.2 KB
- Stars: 0
- Watchers: 0
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Why this Repo?
A hands-on conflict lab sessions for intermediate developers to understand Git merges, rebases, and conflict resolution.
> This is NOT a beginner Git tutorial. It assumes you already know `clone`, `add`, `commit`, and `push`.
## Repository Structure
```
merge-conflict-explore/
│
├── README.md
│
├── 00-git-mental-models/
│ ├── README.md
│ ├── commit-graph.md
│ ├── three-way-merge.md
│ └── index-vs-working-tree.md
│
├── 01-basic-conflicts/
│ ├── README.md
│ ├── same-line-conflict/
│ ├── adjacent-lines-conflict/
│ └── whitespace-conflict/
│
├── 02-real-world-conflicts/
│ ├── README.md
│ ├── long-lived-branch/
│ ├── rebasing-conflicts/
│ ├── cherry-pick-conflicts/
│ └── conflict-after-pull/
│
├── 03-rename-and-move-conflicts/
│ ├── README.md
│ ├── file-rename-vs-edit/
│ └── directory-move-conflict/
│
├── 04-advanced-scenarios/
│ ├── README.md
│ ├── binary-files/
│ ├── lock-files/
│ ├── generated-files/
│ └── submodule-conflicts/
│
├── 05-resolution-strategies/
│ ├── README.md
│ ├── manual-resolution/
│ ├── ours-theirs/
│ ├── rerere/
│ └── merge-tools/
│
├── 06-team-workflows/
│ ├── README.md
│ ├── gitflow-conflicts/
│ ├── trunk-based-conflicts/
│ └── monorepo-conflicts/
│
├── scripts/
│ ├── reset-scenario.sh
│ └── create-conflict.sh
│
└── blog-outline/
│ └── series-outline.md
├── demo/
│ ├── demo-files
```