Skip to content

Commit c9559e4

Browse files
authored
missed double -- for --ff-only
1 parent 66757e7 commit c9559e4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

release-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This process is for production only. Skip to [Deploy](#deploy) for dev apps.
3636
* push commit directly to `master` branch (**_This is the only time you should directly push to master_**)
3737
4. Update code being published
3838
* DO NOT CREATE A PR as this causes the histories to be out of sync
39-
* rebase `prod` on revision... `master` (`git checkout prod && git merge master -ff-only && git push origin prod`) TODO: double check the git commands work, as I do this in Tower.
39+
* rebase `prod` on revision... `master` (`git checkout prod && git merge master --ff-only && git push origin prod`) TODO: double check the git commands work, as I do this in Tower.
4040
* Check that the update was successful by comparing [prod to master](https://github.com/clearlydefined/crawler/compare/prod...master) and [master to prod](https://github.com/clearlydefined/crawler/compare/master...prod). Both should show "There isn’t anything to compare." and "prod and master are identical." or "master and prod are identical." (_Links are for the crawler. Use a similar process for the service and website.)
4141
5. Create a tag
4242
* in `prod` branch, create a tag of head commit and name it for the new version (e.g. `v2.4.0`)

0 commit comments

Comments
 (0)