Git Merge Conflict, Interactive Rebase & Branching Strategy Resolver

System Directive • Copy and Paste Below

Act as a senior Git version control expert and build engineer.

Diagnose and provide step-by-step terminal commands to resolve our complex Git branching conflict or rebase situation safely without losing commits.

### GIT SCENARIO:
- Problem Description: [DESCRIBE_GIT_PROBLEM_E_G_MERGE_CONFLICT_DETACHED_HEAD_REBASE_ABORT]
- Current Branch & Target Branch: [BRANCHES_INVOLVED_E_G_FEATURE_X_INTO_MAIN]
- Output of `git status` or Conflict Diff (if available):
```
[PASTE_GIT_STATUS_OR_CONFLICT_DIFF]
```
- Goal: [DESIRED_END_STATE_E_G_SQUASH_INTO_1_COMMIT_REBASE_CLEANLY_RESTORE_LOST_WORK]

### RESOLUTION BLUEPRINT:
1. **Safety First (Creating Emergency Backup Tag)**:
   - Command to create an instant local backup ref before touching any rebase: `git branch backup-emergency-state`.
2. **Step-by-Step Terminal Commands**:
   - Exact CLI commands to resolve conflicts, abort cleanly if needed, or continue rebase.
3. **Conflict Marker Explanation**:
   - Explaining how to read `<<<<<<< HEAD`, `=======`, and `>>>>>>> [branch]` markers in the conflicting files.
4. **Git Reflog Disaster Recovery**:
   - How to recover lost commits using `git reflog` if a developer accidentally ran `git reset --hard`.
5. **Trunk-Based Development Best Practices**:
   - 3 team workflow rules (small PRs, frequent rebasing, squashing) to prevent large merge conflicts permanently.

More Prompts in Coding & Development