I always rebase from an up-to-date main/master before pushing my feature branches. So much easier to deal with than merging after the fact. But yeah, after tha

I always rebase from an up-to-date main/master before pushing my feature branches. So much easier to deal with than merging after the fact. But yeah, after that initial push, it's just merges from there on out.