Align Fireworks code to CVS head. #577
Closed
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
ghost
assigned 
|
Look like this does not merge correctly. Can you rebase on top of the latest release? |
|
53X release, that is. |
|
-1 |
|
How is remote specified in git rebase? Can't see this option if read the rebase manpage. I have also tried to fetch changes from official cmssw, but when I wanted to push changes to my-cmssw git gave me the usual 'Everything up-to-date'. |
|
I can reproduce the error now, Apparently I did not pull changes from official CMSSW_5_3_X before creating the mydev53 branch. I've fixed this and will make a new pull request on new branch after finish testing cmsShow. |
jbsauvan
pushed a commit
to jbsauvan/cmssw
that referenced
this pull request
Jan 26, 2016
…monox Monojet synchronisation and update to Spring15 miniAOD v2
makortel
pushed a commit
to makortel/cmssw
that referenced
this pull request
Nov 24, 2020
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.
Port changes from CVS HEAD.
Fix crash when set projection center from popup menu.