Skip to content

Commit 438c154

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

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
@@ -66,7 +66,7 @@ A flexible environment is attached to a single mainline environment. Changes can
6666

6767
Learn more about how flexible environments work in the [Flexible Environments](../../getting-started/flexible-environments.md) article.
6868

69-
Merge conflicts can avoid by following these guidelines on the flexible environment:
69+
Merge conflicts can be avoided by following these guidelines on the flexible environment:
7070

7171
* Only work on schema specific to a single feature.
7272
* Do not make changes to schema regularly changed in the mainline environment.

0 commit comments

Comments
 (0)