Lukas May 00e426ac00 fix: Roll back merge when push fails in initiative approval ...

When merge_and_push failed at the push step, the local defaultBranch ref
was left pointing at the merge commit. This made the three-dot diff
(defaultBranch...initiativeBranch) return empty because main already
contained all changes — causing the review tab to show "no changes."

Now mergeBranch returns the previous ref, and approveInitiative restores
it on push failure. Also repaired the corrupted clone state.

2026-03-06 12:31:35 +01:00

14 KiB

Raw Blame History

View Raw