This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 250826 - Make the user --continue rebase after resolving conflicts, prevent breaking repo
Summary: Make the user --continue rebase after resolving conflicts, prevent breaking repo
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 8.0.2
Hardware: All All
: P3 normal with 4 votes (vote)
Assignee: Ondrej Vrabec
Depends on:
Reported: 2015-03-02 16:45 UTC by hifi
Modified: 2016-09-01 20:30 UTC (History)
1 user (show)

See Also:
Exception Reporter:


Note You need to log in before you can comment on or make changes to this bug.
Description hifi 2015-03-02 16:45:43 UTC
When you have a conflict in rebase, you get to resolve conflicts. After resolving conflicts - like with merge - you are left hanging.

It took me a drive home, shower and scratching my head a while to realize how you --continue after such thing. Apparently you need to do "Rebase..." again to get the dialog I would expect after resolving conflicts.

Like in bug 250823, this should be prompted after resolving conflicts to help the workflow. Very much so. The mess I saw today after a human subject *continued* working in this state was outstanding and doing --abort ended up with head->desk and a lot of manual fixing up.

Netbeans doesn't really even prevent you from doing something stupid as you are left in a detached head state and you can just checkout another branch to really throw it off. The status of the repo is "Rebasing..." but your working tree is messed up and you are not in the rebase head anymore but actually in some real branch.

It isn't at fault when it comes to screwing up like this, but the damage can be prevented by not letting the user to break everything (switching branches, committing, etc.) while rebasing.
Comment 1 Ondrej Vrabec 2015-03-02 16:51:37 UTC
yes, definitely.
Comment 2 javydreamercsw 2016-09-01 20:29:36 UTC
Completely agree, was about to write this up.
Comment 3 javydreamercsw 2016-09-01 20:30:13 UTC
Also you have other scenarios, like --skip, --abort that should be taken into account.