Bugzilla – Full Text Bug Listing
| Summary: | [client] could not merge with latest git changes from orion.eclipse.org | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Susan McCourt <susan> | ||||||
| Component: | Git | Assignee: | Tomasz Zarna <tomasz.zarna> | ||||||
| Status: | CLOSED DUPLICATE | QA Contact: | |||||||
| Severity: | major | ||||||||
| Priority: | P3 | CC: | bokowski, libingw, Szymon.Brandys, tomasz.zarna | ||||||
| Version: | unspecified | ||||||||
| Target Milestone: | --- | ||||||||
| Hardware: | PC | ||||||||
| OS: | Windows 7 | ||||||||
| Whiteboard: | |||||||||
| Attachments: |
|
||||||||
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. 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. Note that you can export your project including the .git folder as a zip, to save it for others to look at. (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). 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. 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? (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. actually this looks like a dup of bug 347194 *** This bug has been marked as a duplicate of bug 347194 *** |
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.