Tag: Git

Command Line Jun 28, 2026

Production is broken and staging is full of unfinished work. You cannot merge staging to ship the fix. Here is the hotfix-branch workflow I use to release only the fix, in minutes.

Software Development Jun 22, 2026

A push failed with a 410 and an error that said "deprecated" right next to my git command. It was not git. It was Bitbucket retiring app passwords. Here is the tell, and the fix.

DevOps May 31, 2025

When working with remote development teams, seamless collaboration and automated deployment pipelines become not just a convenience, but a necessity. I recently set up a robust CI/CD pipeline for a custom WordPress project called Nivesh Sansar, and this blog documents the real-world challenges I faced and how I solved them. It covers the parts that […]

Git & Version Control May 25, 2024

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 […]

Git & Version Control May 12, 2024

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 […]