CIP Release Git Procedure - acil-bwh/ChestImagingPlatform GitHub Wiki
-
Merge develop into release with no fast forward git checkout release git merge --no-ff develop
-
Delete files that won’t make it to the release and commit git rm <file> git commit <file> git push
-
Merge release into develop preserving files in develop using strategy ours git checkout develop git merge release -s ours
-
Work on release branch to fix release issues and test git checkout release
git commit git push
-
Create final nipype interfaces
cd ChestImagingPlatform/cip_python/nipype/interfaces/cip python generate_classes.py git commit -m "ENH: Creating new nipype interfaces" * git push
-
Merge to master and tag branch git checkout master git merge --no-ff release git pull git tag -a v0.2.0 -m 'Version v0.2.0' git push origin v0.2.0
-
Merge release to develop git checkout develop git merge --no-ff release