Skip to content
This repository was archived by the owner on Sep 24, 2024. It is now read-only.

Conversation

@sashabaranov
Copy link

No description provided.

@ThomasRuf
Copy link

This is one of my usual Git problems, trying merge, says no conflicts, can be done automatic, and then it say Oops.
If anybody can tell me that I should do?
Thomas

[cid:image002.jpg@01D173DD.B724BD60]

Von: Sasha Baranov [mailto:notifications@github.com]
Gesendet: Dienstag, 1. März 2016 17:09
An: ShipSoft/FairSoft FairSoft@noreply.github.com
Betreff: [FairSoft] Increase XercesC version, previous unavailable (#5)


You can view, comment on, or merge this pull request online at:

#5

Commit Summary

  • Increase XercesC version, previous unavailable

File Changes

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com//pull/5.

@sashabaranov
Copy link
Author

Sorry, Thomas, cant see your image attachement here

@olantwin
Copy link

olantwin commented Mar 2, 2016

Note that the previous release is available under https://archive.apache.org/dist/xerces/c/3/sources/. However it seems this is just a bug-fix release, so it should be safe to upgrade.

Upstream FairSoft fixed this by using the archive link and backported fixes to most of their releases.

@ThomasRuf
Copy link

Dear All,
if anybody could instruct me what to do, would be appreciated. As said earlier, just clicking on

Merge pull request

results in ”Oops, something went wrong.”

thomas

Von: Oliver Lantwin [mailto:notifications@github.com]
Gesendet: Mittwoch, 2. März 2016 11:59
An: ShipSoft/FairSoft FairSoft@noreply.github.com
Cc: Thomas Ruf Thomas.Ruf@cern.ch
Betreff: Re: [FairSoft] Increase XercesC version, previous unavailable (#5)

Note that the previous release is available under https://archive.apache.org/dist/xerces/c/3/sources/. However it seems this is just a bug-fixhttps://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10510&version=12332290 release, so it should be safe to upgrade.

Upstream FairSoft fixed this by using the archive link and backported fixes to most of their releases.


Reply to this email directly or view it on GitHubhttps://github.com//pull/5#issuecomment-191188085.

@sashabaranov
Copy link
Author

Thomas, I dont know what goes wrong, can you please give me write access to this repo, so I can try reproducing this problem?

@ThomasRuf
Copy link

Sorry, this is another thing I have no idea what to do.
It is probably much simpler, I just look at your changes and implement them by hand.

Thomas

Von: Sasha Baranov [mailto:notifications@github.com]
Gesendet: Mittwoch, 2. März 2016 12:58
An: ShipSoft/FairSoft FairSoft@noreply.github.com
Cc: Thomas Ruf Thomas.Ruf@cern.ch
Betreff: Re: [FairSoft] Increase XercesC version, previous unavailable (#5)

Thomas, I dont know what goes wrong, can you please give me write access to this repo, so I can try reproducing this problem?


Reply to this email directly or view it on GitHubhttps://github.com//pull/5#issuecomment-191210725.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants