Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 336812

Summary:	interactive rebase can't be continued
Product:	[Technology] EGit	Reporter:	Edwin Kempin <edwin.kempin>
Component:	UI	Assignee:	Stefan Lay <stefan.lay>
Status:	RESOLVED FIXED	QA Contact:
Severity:	major
Priority:	P3	CC:	curtis.windatt.public, daniel_megert, flood, markus.duft, markus.kell.r, matthias.sohn, ob1.eclipse, remy.suen, stefan.lay
Version:	0.11
Target Milestone:	2.0
Hardware:	All
OS:	All
Whiteboard:

Description Edwin Kempin

2011-02-10 07:53:40 EST

Steps to reproduce:
1. create two branches with conflicting changes
2. rebase one of the branches onto the other -> this will result into a conflict
3. resolve the conflict
4. add the conflict resolution using git add
5. commit the conflict resolution
6. in the Repositories view you can see that the repository is in the state 'rebase interactive'
7. try to continue the rebase (context menu on the repository -> rebase -> continue) -> this results in a 'Rebase Result' dialog saying 'Result status: UP_TO_DATE'
8. the repository is still in the state 'rebase interactive'

Expected:
Best would be if interactive rebase would be working, but since this is not implemented yet, it would be good to prevent users to get stuck in this situation (e.g. do not allow to commit during rebase) or at least to document this case.

Comment 1 Dani Megert

2011-09-30 05:09:48 EDT

This is a major issue since the error message is not helping much.

I had a clean project (no changes applied to it ever). Then I did a 'Pull' which aborted saying rebase STOPPED. After that I was not able to reset or re-checkout. The repository was basically in a dead state for me. The only thing it said all the time was "Rebase interactive".

That dialog should have more clues how to fix the problem or even offer direct solutions/buttons inside the dialog, e.g. 'Abort Rebase'.

Comment 2 Curtis Windatt

2011-10-18 16:30:31 EDT

Just encountered this.  The conflict wizard says the next steps are to continue the rebase, but no indication where to do so. The repositories view is not where I started looking.

I performed the rebase, encountered the conflict, corrected it, then used teh rebase > continue command.  This worked, and the change was successfully pushed.  However, when trying to change branches after, I was still in the rebase interactive state.  The Rebase > ... menu did not appear in the context menu either.  Selecting other repositories then trying again made the Rebase > ... menu appear and I was able to abort. Everything is ok for me now.

Comment 3 Markus Duft

2011-12-22 02:58:45 EST

i just encountered this:

 * create a new feature branch
 * fetch from upstream
 * rebase on origin/master
 * resolve a conflict that arose
 * rebase > continue
 * "rebase successfully finished"
 * repository is still in rebase interactive state and i have no chance to conitnue.

the only thing that works there is aborting the rebase.

this is not good .... :|

Comment 4 Markus Duft

2012-01-03 05:06:16 EST

i found the following. everytime i get into this situation, it is not a bug of EGit/JGit, but "only" a "bad message" (the "HEAD advanced fast-forward" message).

the actual situation i find myself in every time is, that i have zero changes staged when pressing continue (so i didn't accept any changes from the incoming commit). thus i should have actually skipped that commit. and indeed, skipping it resolves the issue and everything works perfectly!

as soon as i have any change staged, things work as expected.

Comment 5 Markus Duft

2012-01-16 10:24:20 EST

i proposed a change that fixes this: 

jgit: http://egit.eclipse.org/r/#change,4959
egit: http://egit.eclipse.org/r/#change,4960

Comment 6 Jan Koops

2012-01-17 08:39:42 EST

*** Bug 359344 has been marked as a duplicate of this bug. ***

Comment 7 Oleg Besedin

2012-02-14 16:18:23 EST

I too encountered it:
- made changes and committed them to a local repo
- did "pull". One file was shown as a conflict and got markers added

At this point EGit shows "Rebase interactive" no matter what.

Comment 8 Stefan Lay

2012-03-09 08:51:13 EST

(In reply to comment #5)
> i proposed a change that fixes this: 
> 
> jgit: http://egit.eclipse.org/r/#change,4959
> egit: http://egit.eclipse.org/r/#change,4960

merged as edc1fee033a23189742c (jgit) and 9dcb21678cb223d64a2 (egit)

Comment 9 Jan Koops

2012-04-20 04:14:32 EDT

The fix works for me (tested with commit 654264e4)

Comment 10 Markus Duft

2012-06-13 05:28:51 EDT

stefan i think you can close this bug...?

Comment 11 Matthias Sohn

2012-09-17 17:03:38 EDT

fix is contained in 2.0