iLCSoft / MarlinFastJet

Marlin processor to interface FastJet
GNU General Public License v3.0
2 stars 8 forks source link

Merge FastJetClustering into MarlinFastJet #6

Closed andresailer closed 7 years ago

andresailer commented 7 years ago

Start addressing ilcsoft/FastJetClustering#1

BEGINRELEASENOTES

ENDRELEASENOTES

andresailer commented 7 years ago

I am very curious to see what will happen with this when rebasing

andresailer commented 7 years ago

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 ...
gaede commented 7 years ago

@andresailer can we merge this now ?

andresailer commented 7 years ago

Yes

gaede commented 7 years ago

@andresailer: "This branch cannot be rebased due to conflicts" - and now ?

andresailer commented 7 years ago

Thats what I feared. Will directly push to origin after lunch

andresailer commented 7 years ago

pushed to master directly