Help with conflicts, detached HEAD, upstream divergence, and similar local Git problems. Follow git publish. Do not rewrite published history unless the user asked.
Inspect
git status
,
git branch -vv
, and the relevant log. State the current problem in one sentence.
Propose the smallest safe commands. Explain what they change. Require explicit confirmation before commands that can discard local changes (
git reset --hard
,
git clean
,
git restore
). Require an explicit user request before history-rewriting commands (
git rebase
,
git commit --amend
of a published commit).
After an authorized command, re-inspect status and remaining conflicts. Never force-push or bypass hooks.