Re: [egit-dev] making push force more handy

[André Dietisheim <adietish@xxxxxxxxxx>]

On 06/18/2013 04:39 PM, Matthias Sohn wrote:

> * a dialog that comes up when push fails non-fast-forward

+1. A dialog that would offer additional information would make this
really usable:


+---------------------------------------------------------------+
| The push was rejected by the server because it would discard  |
| existing commits. You can try to force the push if you are    |
| sure that you want to replace the existing commits with the   |
| new ones.                                                     |
|                                                               |
| Commits to replace:                                           |
| # deadbeef: Implement foo  (Au Thor)                          |
| # 1238abc8: Fix problem bar  (Au Thor)                        |
|                                                               |
| Replaced by:                                                  |
| # abc12345: Implement foo  (Au Thor)                          |
| # def67890: Fix problem bar  (Au Thor)                        |
|                                                               |
|                                      [Cancel]   [Force Push]  |
+---------------------------------------------------------------+

I agree this is better, forget my previous vote for the other solution

Okiedokie, nice detailed suggestion Robin, thanks! Let's go for that one. I'll file a bugzilla and contribute.

 

This way the user would notice if the above contained commits
that are not from them, and a e.g. rebase is necessary. And maybe
the dialog should not be automatic but should be explicitly opened
from the push results dialog. Otherwise it would also appear
directly when just a normal rebase/merge is in order. Or we could
change the text and also offer rebase/merge as buttons there.

that's a great idea, we should also provide rebase and merge action

to fix a failed push

--

Matthias