docs: Add some tips about handling merge issues #21825
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
This seems like a good place to document tips and workarounds for handling issues that commonly come up when doing `git merge` or the like.
anomiex
added
[Type] Enhancement
|
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖 The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available. Once your PR is ready for review, check one last time that all required checks (other than "Required review") appearing at the bottom of this PR are passing or skipped. |
sdixon194
approved these changes
Nov 19, 2021
github-actions
bot
removed
the
[Status] Needs Review
davidlonjon
added a commit
that referenced
this pull request
Nov 23, 2021
* master: (45 commits) Prepare for Boost 1.3.1-beta (#21853) Add 'View all purchases' and 'Activate a product' buttons in My Plan card footer. (#21824) Move Woop menu item method to parent class so filter can be used in WPCOMSH. (#21717) Dismiss licenses activation notice when license is activated. (#21844) assets: Stop `_doing_it_wrong` wrong (#21852) Update/jetpack backup version 1.0.1 (#21851) assets: Release 1.13.0 (#21847) Verification tools: remove old Tools interface (#21846) Connection: deactivate the Connection Manager UI (#21828) assets: Have `register_script()` take a textdomain (#21831) Update/inform first connected plugin (#21672) Analyzer: Handle more code tokens (#21652) Post List: Release version 0.2.4 (#21820) New workflow to push Boost issues to Project Board (#21800) Gist Shortcode: refactor unit tests (#21781) REST API: Return user ID for comment author if present. (#21834) Add License Activation Flow to Jetpack Plugin (#21764) Update wordpress monorepo (#21832) docs: Add some tips about handling merge issues (#21825) Update error screens and detect backup retry (#21735) ...
davidlonjon
added a commit
that referenced
this pull request
Nov 23, 2021
* master: (45 commits) Prepare for Boost 1.3.1-beta (#21853) Add 'View all purchases' and 'Activate a product' buttons in My Plan card footer. (#21824) Move Woop menu item method to parent class so filter can be used in WPCOMSH. (#21717) Dismiss licenses activation notice when license is activated. (#21844) assets: Stop `_doing_it_wrong` wrong (#21852) Update/jetpack backup version 1.0.1 (#21851) assets: Release 1.13.0 (#21847) Verification tools: remove old Tools interface (#21846) Connection: deactivate the Connection Manager UI (#21828) assets: Have `register_script()` take a textdomain (#21831) Update/inform first connected plugin (#21672) Analyzer: Handle more code tokens (#21652) Post List: Release version 0.2.4 (#21820) New workflow to push Boost issues to Project Board (#21800) Gist Shortcode: refactor unit tests (#21781) REST API: Return user ID for comment author if present. (#21834) Add License Activation Flow to Jetpack Plugin (#21764) Update wordpress monorepo (#21832) docs: Add some tips about handling merge issues (#21825) Update error screens and detect backup retry (#21735) ...
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.
Changes proposed in this Pull Request:
This seems like a good place to document tips and workarounds for
handling issues that commonly come up when doing
git mergeor thelike.
Jetpack product discussion
None direct. Probably this sort of thing has been been passed around by word of mouth.
Does this pull request change what data or activity we track or use?
No
Testing instructions: