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

Bug 331078

Summary:

Rebase rolls back due to conflict but there should be no conflict

Product:

[Technology] EGit

Reporter:

Matthias Sohn <matthias.sohn>

Component:

Core

Assignee:

Project Inbox <egit.core-inbox>

Status:

RESOLVED FIXED

QA Contact:

Severity:

normal

Priority:

CC:

robin.rosenberg, stefan.lay

Version:

0.10.0

Target Milestone:

---

Hardware:

OS:

Mac OS X - Carbon (unsup.)

Whiteboard:

Attachments:

Description	Flags
test repository	none

Description Matthias Sohn

2010-11-24 19:12:57 EST

This is a problem I found when testing http://egit.eclipse.org/r/#change,1942 patchset 1.

When trying to rebase the two branches in the attached sample repository rebase is aborted due to a conflict detected by EGit/JGit:
- checkout branch helloworld
- call rebase on master branch from repositories view
- EGit aborts the rebase claiming it found a conflict.

Trying the same rebase using native git succeeds.

Comment 1 Matthias Sohn

2010-11-24 19:13:48 EST

Created attachment 183814 [details]
test repository

Comment 2 Stefan Lay

2010-11-25 04:20:28 EST

This error boiles down to the underlying cherry-pick command. 

You can do the following:
- Check out master
- Cherry-pick helloworld

Native git does this without a conflict, whereas jgit reports a conflict.

Comment 3 Robin Rosenberg

2012-11-05 14:27:34 EST

Fixed a long time ago in 12a5c8d413baab3f27932a7c850dbfc0407ded78 and 049827d7080201fe24f2728b26d681434327f72a

Comment 4 Robin Rosenberg

2012-11-05 14:27:55 EST

..