Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 344769 - Rebase does nothing because of confclits
Summary: Rebase does nothing because of confclits
Status: CLOSED WORKSFORME
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-04 17:37 EDT by Pavol Zibrita CLA
Modified: 2011-11-24 17:18 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 Pavol Zibrita CLA 2011-05-04 17:37:57 EDT 
Build Identifier: 20110218-0911

Doing rebase does nothing. EGit reverts its work and informs the user that 'Rebase faild'.

Reproducible: Always

Steps to Reproduce:
Repository: git://github.com/osmandapp/Osmand.git
1. Checkout geoIntent (create local branch)
2. Rebase to master
3. Egit fails to do it, in command line egit you have options to resolve the conflicts.
Comment 1 Matthias Sohn CLA 2011-05-15 17:51:17 EDT 
I cloned your repo but can't find geoIntent, did you delete that ?
Comment 2 Pavol Zibrita CLA 2011-05-16 02:59:06 EDT 
Yes, sorry, it was deleted in mean time. Anyway, I did something, updating the branch from command line or so, and than the rebase worked also from eclipse. Unfortunatelly, I can't tell you exactly what I did. So, you might close this.
Comment 3 Matthias Sohn CLA 2011-11-24 17:18:05 EST 
This seems to be not reproducable