Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 359344 - Rebase continue FAST_FORWARD does not continue
Summary: Rebase continue FAST_FORWARD does not continue
Status: CLOSED DUPLICATE of bug 336812
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows Vista
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-29 02:43 EDT by Jan Koops CLA
Modified: 2012-01-17 08:39 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jan Koops CLA 2011-09-29 02:43:00 EDT 
Build Identifier: 1.1.0.201109151100-r (on 3.7.0.v20110530 Build id: I20110613-1736)

Rebase continue does not continue when discarting all changes of the conflicting rebasing commit. The Eclipse Log states "FAST_FORWARD", but nothing happens. "git rebase --continue" on the commandline works.
Of course one should have chosen "skip" for this commit, but sometimes one doesn't know before inspecting the conflict.


Reproducible: Always

Steps to Reproduce:
1. Rebase a commit
2. Discart all "their" changes
3. Select Rebase continue
Comment 1 Jan Koops CLA 2012-01-17 08:39:42 EST 

*** This bug has been marked as a duplicate of bug 336812 ***