Git & Version Control May 25, 2024
You have divergent branchesShort 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
Git & Version Control May 12, 2024
Merge made by the ‘ort’ strategyShort 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
Software Development Jun 26, 2017
Points to ponder before you start building your web siteOnline presence is becoming a prime need of every single business due of growing competition everywhere. Here sharing few important points that you should consider before taking a decision to create your website or web presence. Objective and Message via website: Every web visitor comes with a specific concern he/she has in mind. Therefore, you must […]
Read article