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

Bug 346340

Summary:	Strange error if rebase conflict occurs for non-workspace files
Product:	[Technology] EGit	Reporter:	Stefan Lay <stefan.lay>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	jens.baumgart
Version:	1.0
Target Milestone:	1.2
Hardware:	All
OS:	All
Whiteboard:

Description Stefan Lay

2011-05-18 16:19:30 EDT

Rebase a change in a repo which has no eclipse project connected to it. When a rebase conflict occurs, there is an error dialog with the message: "Resources belong to different Repositories".

Comment 1 Jens Baumgart

2011-10-27 09:54:39 EDT

Fix proposed: http://egit.eclipse.org/r/4418

Comment 2 Matthias Sohn

2011-11-27 18:12:36 EST

merged as 6f191180792b94e7bc8371b695c2dc510ded21ad