git
Merge conflict
CONFLICT \(content\): Merge conflict in (.+)
Fixes
- 1.Open conflicted files, resolve the <<<<<<< / ======= / >>>>>>> markers, then `git add` and `git commit`
- 2.Use a merge tool: `git mergetool` (configure with `git config merge.tool <tool>`)
- 3.To abort: `git merge --abort` to return to pre-merge state
mergeconflict-resolution
Related Errors
git3 fixes
Detached HEAD state
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)
git3 fixes
Push rejected — remote has new commits
\! \[rejected\].*\(fetch first\)|failed to push some refs.*Updates were rejected
- •Pull and rebase: `git pull --rebase origin <branch>` then push again
- •Pull and merge: `git pull origin <branch>` then resolve conflicts and push
git3 fixes
Rebase conflict
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)