Skip to content

docs: expand troubleshooting section with additional edge cases #81

Description

@q-soriarty

Problem

The Troubleshooting section currently covers 5 scenarios:

  1. Accidental direct commit to protected branch
  2. Forgot to pull before branching
  3. Squash-merged instead of merge-committing
  4. Force-pushed to a shared branch
  5. 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.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or request

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions