Interesting. Basically a commit to remember a conflict when rebasing. Not entirely my cup of tea as I prefer less noise but helpful for some if conflicts genera

Interesting. Basically a commit to remember a conflict when rebasing. Not entirely my cup of tea as I prefer less noise but helpful for some if conflicts generate lost work too often. I find it annoying when see commits on a PR that says "fixing rebase conflicts" etc. "rebase continue" should have inlined those changes to the relevant commit. My simpler suggestion to avoid unnecessary merges is to try to wrap an alias around merge that simple just prompts whether they tried to rebase first. If you need to merge it often smells like a branch has existed too long.