Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 370235 - Better guidance for resolving rebase conflict from git-repository
Summary: Better guidance for resolving rebase conflict from git-repository
Status: RESOLVED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: 0.4   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: 0.4 RC2   Edit
Assignee: Szymon Brandys CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 357860 (view as bug list)
Depends on:
Blocks:
 
Reported: 2012-01-31 11:03 EST by Mark Macdonald CLA
Modified: 2012-02-16 08:59 EST (History)
2 users (show)

See Also:
malgorzata.tomczyk: review+

Attachments
Fix v1 (1.54 KB, patch)
2012-02-15 07:22 EST, Szymon Brandys CLA 		no flags Details | Diff
View All 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 Mark Macdonald CLA 2012-01-31 11:03:33 EST 
Orion 0.4 I20120130-2230

I just ran into this and found it confusing.

1. On git-repository, I rebased a topic branch against master.
2. Rebase seemed to work -- I didn't see any errors.
   However I noticed that the Push command was missing from git-log and no branch was marked "Active".
3. I went to git-status and found that a conflict had occurred during rebase and I was in a detached state. 

Once I saw the conflict on git-status, it was easy to resolve and continue. But git-repository should give an error and link to git-status to indicate that action is required.
Comment 1 Szymon Brandys CLA 2012-02-07 06:06:06 EST 
The repo page shows the link, but it disappears very quickly. Simon also noticed that yesterday.
Comment 2 Szymon Brandys CLA 2012-02-15 07:22:22 EST 
Created attachment 211040 [details]
Fix v1
Comment 4 Tomasz Zarna CLA 2012-02-16 08:59:25 EST 
*** Bug 357860 has been marked as a duplicate of this bug. ***