flakeUpdate: also pull from main branch when the update branch wasn't merged

Currently the merge base remains fixed. This is ok when updates are merged regularly, but otherwise, it may produce unnecessary conflicts.
Workaround: delete the update branch and re-run the update effect.

More requirements:
 - By default, try to keep history, which can be useful for bisection.
 - Do not throw away non-bot commits.