> but it's probably a legitimate operation to perform a merge during an interactive rebase.

It seems our current representation of the `CurrentOperation` is insufficient to represent this scenario? What if I hit conflicts during a merge in the middle of an interactive rebase?