search

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows
465 stars 10 forks source link

Fork Version 2.2.2.0 dialog coming up after Interactive Rebase to Push changes to remote is misleading #2366

Closed ea35 closed 3 weeks ago

ea35 commented 3 weeks ago

Other day I did an interactive rebase from my feature branch on develop. When I wanted to Push my changes (without forced push), a dialog came up saying I should be pull remote changes first to push my local changes. This leaded my changes to dublicate and my interactive rebase was not succesful.

The commit history filtering was filtered and I did not notice until someone working on develop branch pointed out. I think this will lead my user errors.

Thus, I believe message should be updated to make the user experience better and include that if user trying to do rebase aspecially interactive one they should use forced push instead. Also there is not many explaination in the Fork software regarding normal push and force push. I was scared to use forced push to not break anything in remote branch and this happenned.

DanPristupov commented 3 weeks ago

believe message should be updated

This is what git shows. We will not modify git's messages.

P. S. When you rewrite commit history (which is considered unsafe) and are responsible for the consequences.

ea35 commented 3 weeks ago

Thank you for fast reply! Yeah, it does not make sense to re-write git messages.

PS: It was a suggestion from an user point of view. As, I saw happening to several users including myself. I will close the issue then. Thank you!

DanPristupov commented 3 weeks ago

Git is already very complicated and messages must be easy to google. So, I think Fork should interfere the git messages as less as possible.

DanPristupov commented 3 weeks ago

However, what you said makes sense. May be we can add some hint, at least.

Thank you for creating this issue. We ourselves got used to git and don't even notice such details.