A colleague asks [slightly edited]:
Why didn't you squash your [feature branch merge] commit? I'm new to [project], but I found on [other project] that squashed commits made it much easier to git bisect. And since the [project] test suite is broken frequently, I assume we'll be git bisecting a lot. Un-squashed commits tended to leave broken tests or functionality that never actually shipped.
Git, because it's just "the stupid content tracker", is flexible enough to support just about any development workflow you can think of. You can use pull