The-DevOps-Daily / The-DevOps-Daily/devops-daily
Add a git merge conflict simulator (games)
Nobody has claimed this yet.
- Dominant language
- TypeScript
- Stars
- 1.1k
- Forks
- 392
- Avg merge
- 5h 8m
- Merged PRs (30d)
- 121
Description
There is a git concepts simulator and a git quiz, but neither covers the thing beginners actually fear.
Shape: a conflict is already on screen with the markers in it. The user resolves it and sees the result, with the repository state visible alongside so the markers stop being mysterious.
Worth covering:
- what
<<<<<<<,=======and>>>>>>>each delimit, and which side is which - that resolving means editing the file to what you want, not picking a side
git checkout --oursand--theirs, and that during a rebase they mean the opposite of what you expectgit merge --abortas the escape hatch- a conflict that resolves cleanly but is semantically wrong, which is the one that reaches production
Companion to https://devops-daily.com/posts/linux-git-docker-learning-order, which argues Git is best learned by breaking something and getting it back.
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start by locating the existing Git concepts simulator and Git quiz in the TypeScript project and study how their game state and UI are structured. Define the conflict scenarios and repository-state display from this issue, then verify that users can resolve markers, understand ours/theirs and abort behavior, and encounter a semantically wrong clean resolution.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, typescript
- Domain
- devops
- Issue type
- Feature
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Active
- Clarity
- Mostly clear
- Newbie friendliness
- 48/100