Bugzilla – Full Text Bug Listing
| Summary: | [server] Got into a broken state while self-hosting | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Boris Bokowski <bokowski> | ||||
| Component: | Git | Assignee: | Project Inbox <orion.git-inbox> | ||||
| Status: | RESOLVED WONTFIX | QA Contact: | |||||
| Severity: | normal | ||||||
| Priority: | P3 | CC: | tomasz.zarna | ||||
| Version: | 0.2 | ||||||
| Target Milestone: | --- | ||||||
| Hardware: | PC | ||||||
| OS: | Mac OS X | ||||||
| Whiteboard: | |||||||
| Attachments: |
|
||||||
Created attachment 196241 [details]
zip file
Attachment is too large for Bugzilla and I had to check the "Big File" checkbox. Get it while you still can! :-)
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 |
I made a commit on orion.eclipse.org and pushed it. Then a bit later I made another change, committed it, and tried to push it. That failed because I wasn't up to date so I fetched the latest and clicked on Merge. This didn't work, and in the console I got an error saying that a POST request returned a 500 response. Looking at that response using the Web Inspector (why wouldn't it print all the information to the console??) gave me this: "{"HttpCode":500,"DetailedMessage":"Multiple merge bases for:\n ee53c1c64c9442f54071239e478785bcab1f…" I downloaded the complete directory including the .git folder as a zip and will be attaching it here.