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

Bug 371607

Summary:	[client] Merge command with conflict on git-status should show error and refresh the page
Product:	[ECD] Orion	Reporter:	Malgorzata Janczarska <malgorzata.tomczyk>
Component:	Git	Assignee:	Bogdan Gheorghe <gheorghe>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	libingw, malgorzata.tomczyk, simon_kaegi, Szymon.Brandys
Version:	0.3
Target Milestone:	7.0
Hardware:	PC
OS:	All
Whiteboard:
Bug Depends on:	371261, 386052
Bug Blocks:

Description Malgorzata Janczarska

2012-02-15 06:11:52 EST

When git merge results in conflict on any of the pages we display "Conflicting, go to Git status page", on git-status page this doesn't make sense, because we already are on the git status page.
We should display information about the error and refresh the page, to show the new git status that probably contains some conflicting files.
The only problem here is that after the refresh the error message will be immediately overridden by messages informing that we are loading status, loading minilogs etc. The message should stay on UI after the git-status page is loaded. I hope bug 371261 will come out with an idea to do that.

Comment 1 libing wang

2012-02-15 13:26:31 EST

Currently git-status page does not treat "having conflicts" as error but the red mark already tells user something. On the other hand, if pull happens in git status page then we may want this error message because changing the file list has to have reason. 
This will end up having a state message saying "there is conflicts...".

Comment 2 Szymon Brandys

2012-02-15 17:28:49 EST

(In reply to comment #1)
I don't understand that. I think you could refresh the page when merge ends up with a conflict and show a notification too. Or at least suggest the user to refresh the page to see the current git status, right?

Comment 3 Malgorzata Janczarska

2014-09-12 09:01:11 EDT

Seems for me that it's Bogdan, who took over this view.

Comment 4 Simon Kaegi

2015-05-08 12:19:02 EDT

REsolved in the new git ui