Closed andresailer closed 7 years ago
I am very curious to see what will happen with this when rebasing
commands used to get here:
git remote add fastjetcluster git@github.com:iLCSoft/FastJetClustering.git
git fetch fastjetcluster
git checkout fastjetcluster/master -b fjcMaster
## remove unnecessary files, move files to different folders if needed
git commit -m"FastJetClustering: remove obsolete files before merging"
git checkout master ## MarlinFastJet master
git checkout -b mergeFJC ## MarlinFastJet Feature branch to receive merge
git merge fjcMaster --allow-unrelated-histories ## merged fjcMaster into mergeFJC
### fix warnings, make FJC compile
git commit ...
@andresailer can we merge this now ?
Yes
@andresailer: "This branch cannot be rebased due to conflicts" - and now ?
Thats what I feared. Will directly push to origin after lunch
pushed to master directly
Start addressing ilcsoft/FastJetClustering#1
BEGINRELEASENOTES
ENDRELEASENOTES