[ufo]

On Github the workflow we use for this is rebase in the command line and then press the "Create a merge commit" button in the web UI.