From 1c0166f94a32dba08e66d3521ad6f3fb00220476 Mon Sep 17 00:00:00 2001 From: Jesper Madsen Date: Mon, 30 Jun 2025 10:52:51 +0200 Subject: [PATCH 1/5] Flexible Environments - CICD is supported --- umbraco-cloud/getting-started/flexible-environments.md | 1 - 1 file changed, 1 deletion(-) diff --git a/umbraco-cloud/getting-started/flexible-environments.md b/umbraco-cloud/getting-started/flexible-environments.md index b9a4b60ff1d..555cfe8ae51 100644 --- a/umbraco-cloud/getting-started/flexible-environments.md +++ b/umbraco-cloud/getting-started/flexible-environments.md @@ -43,7 +43,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 From 152158286c413d1a10d841ae1bf64771796b8c86 Mon Sep 17 00:00:00 2001 From: Jesper Madsen Date: Mon, 30 Jun 2025 10:53:17 +0200 Subject: [PATCH 2/5] Add link to Merge Conflicts handling --- umbraco-cloud/getting-started/flexible-environments.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/umbraco-cloud/getting-started/flexible-environments.md b/umbraco-cloud/getting-started/flexible-environments.md index 555cfe8ae51..9b2df61383e 100644 --- a/umbraco-cloud/getting-started/flexible-environments.md +++ b/umbraco-cloud/getting-started/flexible-environments.md @@ -32,6 +32,8 @@ This feature enables: Learn more about the deployment process in the [Deployments](../deployment/) section. +Learn more about handling **Merge Conflict on 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: From 22eadf91b43b067c64cf843d22b69f17fe1e73ea Mon Sep 17 00:00:00 2001 From: Jesper Madsen Date: Mon, 30 Jun 2025 10:58:31 +0200 Subject: [PATCH 3/5] Link to merge conflicts from the troubleshooting article --- umbraco-cloud/troubleshooting/deployments/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/umbraco-cloud/troubleshooting/deployments/README.md b/umbraco-cloud/troubleshooting/deployments/README.md index 6eff88d96df..b361809d8ca 100644 --- a/umbraco-cloud/troubleshooting/deployments/README.md +++ b/umbraco-cloud/troubleshooting/deployments/README.md @@ -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 change of getting merge conflicts on Umbraco Cloud have increased. Read more about what to do in case of Merge conclicts and how to avoid them. + +* [Merge Conflicts on Flexible Environments](./merge-conflicts-on-flexible-environments.md) \ No newline at end of file From d4f3851feb5b7bc1fa8dada4d88562023d85590e Mon Sep 17 00:00:00 2001 From: Esha Noronha <82437098+eshanrnh@users.noreply.github.com> Date: Mon, 30 Jun 2025 13:49:11 +0200 Subject: [PATCH 4/5] Update umbraco-cloud/troubleshooting/deployments/README.md --- umbraco-cloud/troubleshooting/deployments/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbraco-cloud/troubleshooting/deployments/README.md b/umbraco-cloud/troubleshooting/deployments/README.md index b361809d8ca..c9122dc7e93 100644 --- a/umbraco-cloud/troubleshooting/deployments/README.md +++ b/umbraco-cloud/troubleshooting/deployments/README.md @@ -25,6 +25,6 @@ The most common Content [Transfer](../../deployment/content-transfer.md)/[Restor * [Dependency Exception](dependency-exceptions.md). * [Media path too long](path-too-long-exception.md). -With the introduction of Flexible Environments the change of getting merge conflicts on Umbraco Cloud have increased. Read more about what to do in case of Merge conclicts and how to avoid them. +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) \ No newline at end of file From 01011ec32dc48263a3b3f55a85cfdc7deef201e1 Mon Sep 17 00:00:00 2001 From: Esha Noronha <82437098+eshanrnh@users.noreply.github.com> Date: Mon, 30 Jun 2025 13:49:19 +0200 Subject: [PATCH 5/5] Update umbraco-cloud/getting-started/flexible-environments.md --- umbraco-cloud/getting-started/flexible-environments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umbraco-cloud/getting-started/flexible-environments.md b/umbraco-cloud/getting-started/flexible-environments.md index 9b2df61383e..bfb12b61c39 100644 --- a/umbraco-cloud/getting-started/flexible-environments.md +++ b/umbraco-cloud/getting-started/flexible-environments.md @@ -32,7 +32,7 @@ This feature enables: Learn more about the deployment process in the [Deployments](../deployment/) section. -Learn more about handling **Merge Conflict on Flexible Environments** in the [Troubleshooting](../troubleshooting/deployments/merge-conflicts-on-flexible-environments.md) section. +Learn more about handling merge Conflicts in Flexible Environments in the [Troubleshooting](../troubleshooting/deployments/merge-conflicts-on-flexible-environments.md) section. ## Project Prerequisites