Added a new section - Syncing Changes Between Mainline and Flexible... #7020
Conversation
This file contains hidden or 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
sofietoft
reviewed
Apr 9, 2025
Contributor
sofietoft
left a comment
sofietoft
left a comment
There was a problem hiding this comment.
Looks good 💪
I've made a suggestion that enables us to link to the merge conflicts guide from this one - I think that would be good to do!
Co-authored-by: sofietoft <stk@umbraco.com>
Contributor
Author
|
Thanks for the review, @sofietoft 🙌 I've incorporated your comments. |
sofietoft
approved these changes
Apr 10, 2025
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.
…Environment
Description
What did you add/update/change?
Type of suggestion
Product & version (if relevant)
Cloud
Deadline (if relevant)
Anytime