This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
exovvrun2:ntuplizer [2015/02/05 19:21] – taarre | exovvrun2:ntuplizer [2015/05/29 12:16] (current) – [Resolved and unresolved issues] taarre | ||
---|---|---|---|
Line 26: | Line 26: | ||
git commit -m "What you did" | git commit -m "What you did" | ||
git push official_ntuplizer master | git push official_ntuplizer master | ||
- | (If you are a bit nervous like me and want to keep your own " | + | (Ons! If you are a bit nervous like me and want to keep your own " |
git checkout -b mergebranch | git checkout -b mergebranch | ||
git fetch official_ntuplizer | git fetch official_ntuplizer | ||
git merge mergebranch official_ntuplizer/ | git merge mergebranch official_ntuplizer/ | ||
Fix merge conflicts, add and commit. If the merging went well and you don't need your unmarked version anymore, you can merge the new branch with the master branch and delete the new: | Fix merge conflicts, add and commit. If the merging went well and you don't need your unmarked version anymore, you can merge the new branch with the master branch and delete the new: | ||
- | git checkout master | + | |
- | git merge mergebranch | + | git merge mergebranch |
- | git branch -d mergebranch | + | git branch -d mergebranch |
+ | git push official_ntuplizer master | ||
+ | ) | ||
+ | |||
+ | == Submitting jobs == | ||
+ | python submitJobsOnT3batch.py -C submitJobsOnT3batch.cfg --useDAS | ||
===== Some links ===== | ===== Some links ===== | ||
Line 41: | Line 46: | ||
* The new ntuplizer for Run 2 can be found at Git: | * The new ntuplizer for Run 2 can be found at Git: | ||
* Remember to fork your own version before cloning your personal repository to your directory! | * Remember to fork your own version before cloning your personal repository to your directory! | ||
+ | |||
+ | ===== Resolved and unresolved issues ===== | ||
+ | * [[exovvrun2: | ||
+ | * [[exovvrun2: |