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.
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.