Problem
The Troubleshooting section currently covers 5 scenarios:
- Accidental direct commit to protected branch
- Forgot to pull before branching
- Squash-merged instead of merge-committing
- Force-pushed to a shared branch
- Cherry-pick to another branch
Additional real-world scenarios are missing:
- "I merged the wrong branch into develop/main"
- "I need to undo a merge that was already pushed"
- "I created a branch from main instead of develop"
- "My PR has merge conflicts — how do I resolve them in Gitflow?"
- "I accidentally deleted a branch before it was merged"
- "I committed secrets/credentials — how do I clean up?"
Expected behavior
Add recovery steps for the most common additional scenarios. Prioritize by likelihood and severity.
Problem
The Troubleshooting section currently covers 5 scenarios:
Additional real-world scenarios are missing:
Expected behavior
Add recovery steps for the most common additional scenarios. Prioritize by likelihood and severity.