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

Bug 378290

Summary:	Fetching&merge does not generate conflicting files.
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Git	Assignee:	Project Inbox <orion.git-inbox>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	major
Priority:	P3	CC:	edyta.przymus, susan, Szymon.Brandys
Version:	0.4
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description libing wang

2012-05-02 14:06:44 EDT

I hit an issue which really blocked me a while.
I had some changes and went to git status page and did a fetch.
It tells me there are some incoming changes, good.
Then I did a merge. It told me "failed" without a reason. I tired several times, same thing.
I was almost about to open a bug untill I went to repositories page and did a pull. I told me "Checkout conflict with files:foo.js".
Now I understand I am having conflicts with the incoming files but hard to determine where are conflicting.

Then I copied my changes and pasted into my localhost. I had to use git cmd now because at least it tells me I have to stash first, pull, and stash apply.
Now I get the conflicting files marked as red and I can continue the work.

I remember that Orion was able to generate conflicting files. Not sure if this is a regression.

Comment 1 libing wang

2012-05-02 14:21:57 EDT

Susan, not related to the merge bug but my extra efforts to copy files reminded me  this:
It will be nice to have a copy command on the selection of files, similar to the selection commands in navigator. It says that if a selection presents a collection  of resources all the item level commands should apply?
Another example would be search:
I want to copy all the files containing a keyword.

If so I will open a separate bug...

Comment 2 John Arthorne

2015-05-05 14:37:40 EDT

Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. For more details see:

https://dev.eclipse.org/mhonarc/lists/orion-dev/msg03444.html