git

Rebase conflict

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

Fixes

1.Resolve conflicts in the listed files, then `git add .` and `git rebase --continue`
2.Skip the problematic commit: `git rebase --skip` (loses that commit's changes)
3.Abort the rebase entirely: `git rebase --abort` to return to original state

rebaseconflict-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