[neweroldguy]

This is what I do unless I’m working with a large number of people on the feature branch (which is rare, usually that would be multiple branches).

You get the equivalent of “mergeless” history (just restrict your git log to merge commits) but can dig into the individual feature histories easily.