Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 347384 - [client] could not merge with latest git changes from orion.eclipse.org
Summary: [client] could not merge with latest git changes from orion.eclipse.org
Status: CLOSED DUPLICATE of bug 347194
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-26 18:50 EDT by Susan McCourt CLA
Modified: 2011-10-21 11:37 EDT (History)
4 users (show)

See Also:

Attachments
screenshot saying my merge failed (95.22 KB, image/png)
2011-05-26 18:50 EDT, Susan McCourt CLA 		no flags Details
git-status page after merge failure (161.42 KB, image/png)
2011-05-26 18:54 EDT, Susan McCourt CLA 		no flags Details
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 Susan McCourt CLA 2011-05-26 18:50:00 EDT 
Created attachment 196710 [details]
screenshot saying my merge failed

- I was working in orion.eclipse.org and committed some changes.
- I sent to push them and got an error because I'm not up to date.  (Expected)
- so I went to git remote and fetched.  Saw Simon's exciting changes coming in.

I knew I'd have a merge on my hands.  But I wasn't sure what to do.  So I pushed "Merge" and got the error that says I should go to git status page.  OK.

I went to the git-status page and there's nothing at all to indicate that I've got merge work to do.
Comment 1 Susan McCourt CLA 2011-05-26 18:54:41 EDT 
Created attachment 196711 [details]
git-status page after merge failure

the files shown are the same files I've had all day in git-status.
One of the files (setup.js) is a real change I made.  The others are the false positive changes reported in bug 347194.
Comment 2 Susan McCourt CLA 2011-05-26 18:56:35 EDT 
This bug forced me off orion.eclipse.org because I really needed to get my changes pushed.  I went back to localhost and command line.

Feel free to login to my orion.eclipse.org account (sfranklin) if you want to debug something.
Comment 3 Boris Bokowski CLA 2011-05-26 19:43:47 EDT 
Note that you can export your project including the .git folder as a zip, to save it for others to look at.
Comment 4 Susan McCourt CLA 2011-05-26 23:08:15 EDT 
(In reply to comment #3)
> Note that you can export your project including the .git folder as a zip, to
> save it for others to look at.

Good idea, I'll do that when I return to orion.eclipse.org.
(The require js changes require an updated server so I won't be using orion.eclipse.org until we promote another build).
Comment 5 Tomasz Zarna CLA 2011-05-27 09:53:51 EDT 
Susan, could you please try to export that project from orion.eclipse.org and import it into localhost. I wonder if it will get back to normal when ran locally, just like it did on bug 347194, comment 12.
Comment 6 Tomasz Zarna CLA 2011-10-21 05:59:15 EDT 
Susan, do you think we can close it for now, it's almost half a year old, and reopen if it occurs again? Or maybe mark it as a dupe of bug 357860 which looks similar?
Comment 7 Susan McCourt CLA 2011-10-21 11:32:36 EDT 
(In reply to comment #6)
> Susan, do you think we can close it for now, it's almost half a year old, and
> reopen if it occurs again? Or maybe mark it as a dupe of bug 357860 which looks
> similar?

We can close it.  I don't think it's a dupe of the other bug, this bug involved lots of false positives in the git status, and I haven't seen that in a long time.
Comment 8 Susan McCourt CLA 2011-10-21 11:37:36 EDT 
actually this looks like a dup of bug 347194

*** This bug has been marked as a duplicate of bug 347194 ***