Skip to content

Commit e0f652c

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

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
@@ -8,7 +8,7 @@ A merge conflict happens when one file or item contains changes in more than one
88

99
This guide explains how to resolve these merge conflicts and how to avoid them.
1010

11-
## How to Resolve a Merge Conflict on a Flexible Environment
11+
## Resolving a Merge Conflict in a Flexible Environment
1212

1313
The image below shows a merge conflict when pulling from the mainline environment to a flexible environment.
1414

0 commit comments

Comments
 (0)