Skip to content

Commit 91f95e1

Browse files
sofietofteshanrnh
andauthored
Update merge-conflicts-on-flexible-environments.md
Co-authored-by: Esha Noronha <[email protected]>
1 parent 438c154 commit 91f95e1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

umbraco-cloud/troubleshooting/deployments/merge-conflicts-on-flexible-environments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The final thing needed to be done is to complete the deployment to the mainline
6060
In case you do not see your changes reflected on the flexible environment, [update the schema manually](../../deployment/deploy-dashboard.md#update-umbraco-schema-from-data-files) from the Umbraco backoffice. This will give you an idea of what is wrong enabling you to resolve it.
6161
{% endhint %}
6262

63-
## How to Avoid Merge Conflicts on a Flexible Environment
63+
## Avoiding Merge Conflicts in a Flexible Environment
6464

6565
A flexible environment is attached to a single mainline environment. Changes cannot be deployed from the flexible to the mainline environment, before changes from the mainline are pulled into the flexible environment.
6666

0 commit comments

Comments
 (0)