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

Bug 370235

Summary: Better guidance for resolving rebase conflict from git-repository
Product: [ECD] Orion Reporter: Mark Macdonald <mamacdon>
Component: GitAssignee: Szymon Brandys <Szymon.Brandys>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: john.arthorne, simon_kaegi
Version: 0.4Flags: malgorzata.tomczyk: review+
Target Milestone: 0.4 RC2   
Hardware: PC   
OS: All   
Whiteboard:
Attachments:
Description Flags
Fix v1 none

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. ***