Restore chunk lost in git merge error #2819
Merged
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
|
A new Pull Request was created by @wmtan for CMSSW_7_1_ROOT6_X. Restore chunk lost in git merge error It involves the following packages: CondCore/ORA @ggovi, @cmsbuild, @apfeiffer1, @Degano, @nclopezo can you please review it and eventually sign? Thanks. |
ktf
added a commit
that referenced
this pull request
Mar 12, 2014
ROOT6 -- Restore chunk lost in git merge error
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.
When the latest changes in 7_1_X were merged into 7_1_ROOT6_X, one chunk of code in CondCore/ORA/interface/Object.h was mysteriously dropped, causing numerous (119) compilation errors.
This very urgent pull request restores the dropped chunk and fixes most, if not all, of the compilation errors.
Please merge immediately.