I don't want to use "Update with merge commit" because that tends to make a mess of the history.