Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 346340 - Strange error if rebase conflict occurs for non-workspace files
Summary: Strange error if rebase conflict occurs for non-workspace files
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.0   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 1.2   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-18 16:19 EDT by Stefan Lay CLA
Modified: 2011-11-27 18:12 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 Stefan Lay CLA 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 CLA 2011-10-27 09:54:39 EDT 
Fix proposed: http://egit.eclipse.org/r/4418
Comment 2 Matthias Sohn CLA 2011-11-27 18:12:36 EST 
merged as 6f191180792b94e7bc8371b695c2dc510ded21ad