docs: add clarifying back-merge instruction #2080
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## next #2080 +/- ##
=======================================
Coverage 97.10% 97.10%
=======================================
Files 111 111
Lines 2766 2766
Branches 738 738
=======================================
Hits 2686 2686
Misses 77 77
Partials 3 3 ☔ View full report in Codecov by Sentry. |
size-limit report 📦
|
timzchang
approved these changes
Oct 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding a
git pullto grab the latest onnextbefore attempting to back-merge, so that the push isn't rejected unnecessarily. Makes collaboration a little smoother :)Without that, if any PRs land on
nextbefore a release is completed, it can cause some merge noise and a little off-script actions that can leave the repository in an ambiguous state.Test Plan: