Problem
After rebasing the stack (manually, since stck sync didn't detect the divergence — see #44), stck push refuses to push with:
error: remote branch `origin/<branch>` has commits not in local `<branch>`; pull or rebase to integrate remote changes before pushing
This is expected behavior after a rebase — the history has been rewritten. But force pushing is the whole point of pushing after a sync/rebase.
Suggestion
- Add
--force or --force-with-lease flag to stck push
- Or use
--force-with-lease by default, since stck push is always called after stck sync which rewrites history
Problem
After rebasing the stack (manually, since
stck syncdidn't detect the divergence — see #44),stck pushrefuses to push with:This is expected behavior after a rebase — the history has been rewritten. But force pushing is the whole point of pushing after a sync/rebase.
Suggestion
--forceor--force-with-leaseflag tostck push--force-with-leaseby default, sincestck pushis always called afterstck syncwhich rewrites history