git Errors

10 error patterns

CONFLICT \(content\): Merge conflict in (.+)

•Open conflicted files, resolve the <<<<<<< / ======= / >>>>>>> markers, then `git add` and `git commit`
•Use a merge tool: `git mergetool` (configure with `git config merge.tool <tool>`)

You are in 'detached HEAD' state

•Create a branch to keep your work: `git checkout -b my-branch`
•Return to a branch: `git checkout main` (commits in detached HEAD may be lost without a branch)

\! \[rejected\].*\(fetch first\)|failed to push some refs.*Updates were rejected

CONFLICT.*could not apply|error: could not apply

•Resolve conflicts in the listed files, then `git add .` and `git rebase --continue`
•Skip the problematic commit: `git rebase --skip` (loses that commit's changes)

CONFLICT.*in.*stash|error:.*could not apply.*stash

•Resolve the conflicts manually, then `git add .` — the stash remains in the list for safety
•Drop the stash after resolving: `git stash drop stash@{0}`

Permission denied \(publickey\)|Could not read from remote repository

•Check your SSH key is added to the agent: `ssh-add -l` — if empty, run `ssh-add ~/.ssh/id_ed25519`
•Verify the key is added to your Git hosting account (GitHub/GitLab/Bitbucket Settings → SSH Keys)

git-lfs.*smudge.*error|batch response.*Git LFS

fatal: No url found for submodule path|Submodule.*registered for path.*not found

•Initialize submodules: `git submodule init && git submodule update --recursive`
•Re-clone with submodules: `git clone --recurse-submodules <url>`

fatal: Need to specify how to reconcile divergent branches

•Set default pull strategy: `git config pull.rebase true` (rebase) or `git config pull.ff only` (fast-forward only)
•One-time fix: `git pull --rebase origin <branch>` or `git pull --no-rebase origin <branch>`

fatal: bad default revision 'HEAD'|reflog.*not found|HEAD is now at