-
Notifications
You must be signed in to change notification settings - Fork 59
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
feat: merge latest v0.4 to master #1499
Conversation
* docs: add new changelogs for v0.4.7-pre.1 * docs: add sentry error fix to changelog
Tried to work through merging this PR with @unnawut. Because In the normal course of development with a long-running release branch, we wouldn't want to merge up from To merge the changes from the long-running release branch into master next time, the process would look something like:
We may want to revisit the branch protection rules if we're committed to creating release branches from tags rather than using long-running branches. We could let go of the older long-running release branches. |
Another thing is, the previous release I did a squash merge, and we lost all the useful commits info and ended up with a blanket "Merge v0.4 to master" commit. This time around I'd like to try the default merge to retain the commits |
Overview
Merging v0.4.7 changes back to master to keep code branching to the minimum.
Changes
Testing
N/A