@Nifflas The trick to using git well is not to be smart, the trick is you start and never stop using it daily starting from 2005 and you internalize the quirks as they are added.
Plan B if it is no longer 2005 and not possible to do the above is to have a friend or colleague who did this.