Developersgitversion-controldebugging

Git Conflict and Command Resolver

Resolves complex git conflicts, detached heads, and state disasters with safe, step-by-step terminal commands.

Use Case

Recovering from scary terminal Git messages, corrupted branches, or complex merge bottlenecks safely.

AI Prompt

Act as an expert Git Administrator. Explain the step-by-step commands to resolve the following git problem or state: [describe your problem, e.g., detached HEAD, restoring deleted unstaged files, a multi-file merge conflict, cherry-picking gone wrong]. Explain what caused the state, the safest terminal commands to fix it, and how to verify that the fix was successful without losing any committed history.

How to Use

1Describe the current broken or confusing state of your Git repository.
2Run the prompt to generate recovery commands.
3Follow the step-by-step resolution path in your CLI and verify local history.

Example Output

To recover from a detached HEAD state and keep your changes, you first need to create a temporary branch using git checkout minus b temp branch. This saves your current commits. Then, checkout your main branch, merge the temporary branch to sync the histories, and finally delete the temporary branch safely using git branch minus d temp branch.

Related Prompts

View All

Interactive Git Merge Conflict Resolver

Safely analyzes and resolves complex Git merge conflicts by comparing conflicting code blocks logically.

gitversion-controlconflict-resolution

View Prompt

Semantic PR and Commit Log Drafter

Generates clean, structured Git commit messages and detailed Pull Request descriptions from raw diff files.

gitgithubdocumentation

View Prompt

PR Description and Git Commit Composer

Drafts clear, descriptive pull request templates and semantic git commit messages from raw diffs.

gitpull-requestdeveloper-workflow

View Prompt