New article: Merge Conflicts on Flexible Environments #7013
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
mclausen
approved these changes
Apr 9, 2025
|
|
||
| * The log file containing a list of the conflicting files. | ||
| * The clone link for the flexible environment. | ||
| * The clone link for the mainline environment that flexible environment is connected to. |
Member
There was a problem hiding this comment.
Conflicts can happen between any environment, that is merging together.
Would it make sense to call them source and destination environment?
Contributor
Author
There was a problem hiding this comment.
This guide is specifically for merge conflicts between a flex env and a mainline env.
We already have a guide on how to resolve merge conflicts between mainline environments.
If the process is the same, then we need to merge the two articles and rewrite it.
This might not be possible to get done before Friday.
eshanrnh
reviewed
Apr 9, 2025
Contributor
eshanrnh
left a comment
eshanrnh
left a comment
There was a problem hiding this comment.
Looks good to me, @sofietoft 🙌 Just a couple of typo suggestions here and there,,,
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
Contributor
Author
|
@eshanrnh - I've updated the list under "Preparations". |
eshanrnh
reviewed
Apr 10, 2025
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Show resolved
Hide resolved
eshanrnh
reviewed
Apr 10, 2025
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
eshanrnh
reviewed
Apr 10, 2025
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
eshanrnh
reviewed
Apr 10, 2025
umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md
Outdated
Show resolved
Hide resolved
Contributor
|
I've added my thoughts, @sofietoft 🙌 |
Co-authored-by: Esha Noronha <82437098+eshanrnh@users.noreply.github.com>
eshanrnh
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.
Description
Added a new article about how to resolve merge conflicts with flexible environments.
Also fixed some environment refs in other articles while waiting for deployments to complete.