I’ve been using git-absorb for a few years now. Usually as git absorb -b origin/master, sometimes with --force when working in other people’s branches. It’s great, but it needs some time to get used to it.
1 Like