git

Divergent branches — no reconciliation strategy

fatal: Need to specify how to reconcile divergent branches

Fixes

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

pulldivergentconfig

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