diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index 448338d1a619a8b1a184a111fc4971bc6cff05b1..166238416ef5920e27870983dba1f6b8877164c7 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -7,7 +7,7 @@ - [ ] (Optional) You can now deploy stable to dspace-dev (`./release.sh $VERSION_NUMBER-RC-$RCNUMBER`) - [ ] Make sure that the stable branch is clean and all commits are pushed to origin - [ ] `git checkout production` -- [ ] `git checkout -b v$VERSION_NUMBER $HASHID -- .` +- [ ] `git checkout -b $VERSION_NUMBER $HASHID` The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed) - [ ] `git merge --no-ff stable` - [ ] resolve conflicts (though there shouldn't be any) and commit @@ -15,7 +15,7 @@ - [ ] Run the clarindev2clarin.sh script - [ ] `git commit -a ` - [ ] `git checkout production` -- [ ] `git merge v1.3-$VERSION_NUMBER` +- [ ] `git merge $VERSION_NUMBER` - [ ] resolve conflicts and commit - [ ] `git tag -a $VERSION_NUMBER -s (-u $GPG_ID_HASH)` defaults to your default GPG key - [ ] `git branch -d $VERSION_NUMBER`