Fix merge problem #2548
Merged
Fix merge problem #2548
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix problem when 7_1_X was merged into 7_1_THREADED_X. There was a conflict and some necessary changes were not merged. This is causing compilation to fail in 7_1_THREADED_X.
|
@ktf Giulio, please bypass signatures since this was a merge failure problem. |
|
Do we want to revisit the merge strategy? |
|
Today I checked all the files modified in the random number service commit that I put on the threaded branch. The good news is that there are no more merge conflict problems related to that commit. On the other hand, future commits to 7_1_X could still conflict with that random number service branch commit. So far there have been 4 merge problems related to it that have been fixed, 3 by me and one by Andrea Bocci. At least they all showed up in obvious ways, compilation failures or unit test failures. I did not check anything other than that one commit and the related fixes. |
ggovi
pushed a commit
to ggovi/cmssw
that referenced
this pull request
Jan 11, 2017
added gcc-atomic toolfile
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix problem when 7_1_X was merged into 7_1_THREADED_X.
There was a conflict and some necessary changes were
not merged. This is causing compilation to fail in
7_1_THREADED_X.