Post #2695912

@isaiah@mastodon.social Overall, I have no hard rules, my handling of this varies pragmatically from project to project. One consistent habit is rebasing on the main branch very regularly. I hate dealing with merge conflicts, and I hate nonlinear histories when tracing regressions. So even in projects with a policy to use merge commits, I will try to make sure the “loops” created by my merges will be as short as possible. I don’t use merge commits at all if I get to choose.