Course with Emmanuelle
Emmanuelle — Git Merge Conflict Rescue
Git merge conflict rescue as 1:1 practice, one safe command at a time, with a backup branch created before you touch anything. Five stages covering rebase, detached HEAD, reflog and undoing a bad force-push, until you recover three unfamiliar broken repositories with no destructive command.
What you’ll master — Outcomes you can use
- I recover a repository without asking anyone
- I recover three unfamiliar broken states without one destructive command
Your tutor
A release engineer who has rescued repositories at 2am and has never once said just delete the branch and re-clone.
Unflappable · Methodical · Quietly protective
Questions about this course
How do I fix a merge conflict without losing my commits?
Git merge conflict rescue as 1:1 practice, one safe command at a time, with a backup branch created before you touch anything. Five stages covering rebase, detached HEAD, reflog and undoing a bad force-push, until you recover three unfamiliar broken repositories with no destructive command.