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.

Sign up for GitHub

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

Jump to bottom

Document hotfix protocol #6589

Merged
merged 1 commit into from
Jun 25, 2019
Merged

Document hotfix protocol #6589

merged 1 commit into from
Jun 25, 2019
+13 −0

Conversation

danfinlay
Copy link
Contributor

No description provided.

@danfinlay danfinlay requested a review from danjm May 9, 2019 19:35
@metamaskbot
Copy link
Collaborator

Builds ready [ee049ae]: chrome, firefox, edge, opera

Gudahtt
Gudahtt approved these changes Jun 25, 2019
View reviewed changes
Copy link
Member

@Gudahtt Gudahtt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great - simple and straightforward. Definitely worthwhile to reduce confusion and ambiguity in these situations.

docs/publishing.md
- Use a hotfix tag.
- Should be proposed against the `master` branch.

The version and changelog bump should then be made off the `master` branch, and then merged to `develop` to bring the two branches back into sync. Further time can be saved by incorporating the version/changelog bump into the PR against `master`, since we rely on @MetaMaskBot to run tests before merging.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remember to update this when the release automation PR is merged

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guarantee we will not unless we formally note it somewhere ;)

Maybe a fresh issue? Maybe add as a checklist item to the automation issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added related issue to release labeled issue.

@danfinlay danfinlay merged commit 76e7c3b into develop Jun 25, 2019
@danfinlay danfinlay deleted the DocumentHotfixProtocol branch June 25, 2019 22:01
@danfinlay danfinlay mentioned this pull request Jul 1, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gudahtt Gudahtt Gudahtt approved these changes

@danjm danjm Awaiting requested review from danjm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@danfinlay @metamaskbot @Gudahtt