Offer quick pull/rebase or pull/merge when pushing while behind

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows

459 stars 10 forks source link

Offer quick pull/rebase or pull/merge when pushing while behind #2067

Closed skttl closed 2 months ago

skttl commented 9 months ago

If I try to push something, but I am behind, I get a dialog saying push failed because I am behind.

In this situation, it would be nice if the dialog had a button, that would pull latest changes and rebase/merge, and afterwards do the push again.

Now I have to close the dialog, pull and then push again.

DanPristupov commented 9 months ago

Synchronization/merge is a critical task which should not be performed automatically. I don't want to give a user a way to merge changes and push the result in one click (which might be occasional).

Now I have to close the dialog, pull and then push again.

Yes, and this is the intentional behavior which reduces the chance of a user error. There is enough time to figure out why push has failed and how to fix that.