git

Stash apply conflict

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

Fixes

1.Resolve the conflicts manually, then `git add .` — the stash remains in the list for safety
2.Drop the stash after resolving: `git stash drop stash@{0}`
3.Try applying to a clean branch: `git checkout -b temp-branch` then `git stash pop`

stashconflict-resolution

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