Tag

Tag: Version Control

You have divergent branches

Git & Version Control May 25, 2024

You have divergent branches

Short answer: your local branch and the remote branch both have commits the other does not, and Git will not guess how to combine them. Pick one and set it once: git config pull.rebase false to merge, git config pull.rebase true to rebase, or git config pull.ff only to allow only fast-forwards. Add --global to […]

Read article
Merge made by the ‘ort’ strategy

Git & Version Control May 12, 2024

Merge made by the ‘ort’ strategy

Short answer: Merge made by the 'ort' strategy. is not an error. Git printed it because your git pull or git merge created a merge commit, and ort is the engine it used to build that commit. Ort has been Git’s default merge strategy since Git 2.34. Nothing needs fixing. Introduction Git keeps improving how […]

Read article