search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.44k stars 1.23k forks source link

Ability to go back if merge has been cancelled accidentally #968

Open richardtop opened 5 months ago

richardtop commented 5 months ago

Scenario:

  1. User tries to merge or rebase
  2. There are conflicts, then the "conflicts resolution view" appears.
  3. the user fixes the conflicts
  4. Accidentally presses "cancel"
  5. All of the data is lost

I suggest either adding a popup ("are you sure to close the merge operation") or an ability to get back to the merge view.