Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release process documentation #196

Closed
reaperzn opened this issue Aug 14, 2018 · 0 comments
Closed

Update release process documentation #196

reaperzn opened this issue Aug 14, 2018 · 0 comments

Comments

@reaperzn
Copy link
Contributor

reaperzn commented Aug 14, 2018

Update release process to ensure the following:

  1. All PRs must be "Merge" NOT "squash and merge"**
  2. All release PRs from master back to develop must be performed locally by a repo admin with push rights to the develop branch
$ git checkout develop
$ git pull
$ git merge --no-ff master
$ git push develop

Resolve any conflicts locally, and only push resolution to the develop branch.

This is to avoid merge conflicts during the release process.

@rhodesn rhodesn closed this as completed Mar 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants