git tip: when I'm working on a branch that has significantly diverged from main, I first merge main into the branch. This allows me to fix merge conflicts while allowing other people to update main. After testing, I then merge the branch into main. 95% of the time this results in a fast-forward
9 months ago