Skip to content

Flexible Environments - clarify link to Merge Conflicts article #7205

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 30, 2025
Merged

Flexible Environments - clarify link to Merge Conflicts article #7205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c0166f
Flexible Environments - CICD is supported
jesp209i Jun 30, 2025
1521582
Add link to Merge Conflicts handling
jesp209i Jun 30, 2025
22eadf9
Link to merge conflicts from the troubleshooting article
jesp209i Jun 30, 2025
d4f3851
Update umbraco-cloud/troubleshooting/deployments/README.md
eshanrnh Jun 30, 2025
01011ec
Update umbraco-cloud/getting-started/flexible-environments.md
eshanrnh Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion umbraco-cloud/getting-started/flexible-environments.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ This feature enables:

Learn more about the deployment process in the [Deployments](../deployment/) section.

Learn more about handling merge Conflicts in Flexible Environments in the [Troubleshooting](../troubleshooting/deployments/merge-conflicts-on-flexible-environments.md) section.

## Project Prerequisites

Before you can add a Flexible environment to your project, the following prerequisites must be met:
Expand All @@ -43,7 +45,6 @@ Before you can add a Flexible environment to your project, the following prerequ

* Only one flexible environment is available.
* Flexible environments are available only for projects paid with credit cards or credits.
* CI/CD Pipelines are not supported.
* Flexible Environments are not available for Heartcore projects.

## Plans and Availability
Expand Down
4 changes: 4 additions & 0 deletions umbraco-cloud/troubleshooting/deployments/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ The most common Content [Transfer](../../deployment/content-transfer.md)/[Restor
* [SQL Timeouts](https://docs.umbraco.com/umbraco-deploy/deploy-settings#timeout-settings).
* [Dependency Exception](dependency-exceptions.md).
* [Media path too long](path-too-long-exception.md).

With the introduction of Flexible Environments, the chance of getting merge conflicts on Umbraco Cloud has increased. Read more about what to do in case of merge conflicts and how to avoid them.

* [Merge Conflicts on Flexible Environments](./merge-conflicts-on-flexible-environments.md)