(Just a small one this time, already spent the evening fixing the outdated crap!)

The problem

One of the worst things for my ADHD brain is the context switch between feature branches. They’re loads of busy work, normally in Jira/AzureDevops/whatever to get the ticket name/branchname sorted and it fuckin’wrecks my brain.

I usually end up with all my changes floating, uncommitted, in main, awaiting me to find the branch name I need to move them over in a checkout. That, or buried in a stash when I just wanna code.

The solution

  1. Just make a damn branch.
  2. Deal with my changes locally.
  3. git branch -m <old-branch-name> <new-branch-name>
  4. git push (--set-remote-upstream is needed if you don’t have push.autoSetRemote enabled)
  5. Relax.

Yeah, I know. It’s not actually that revolutionary, but having my changes in local branches that I can manage properly is nice, and I can put off the dreaded branch faff later to merge time.

The usual flow of “make branch -> checkout -> work” just adds far too much inertia to the process. So, enjoy, I guess.