Skip to content

Commit 6d13a8c

Browse files
committed
Added source and target to the environment names under preparations
1 parent e0f652c commit 6d13a8c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ To start debugging the merge conflict, a log file containing a list of conflicti
2121
Before you start resolving the merge conflict, ensure you have the following things ready:
2222

2323
* The log file containing a list of the conflicting files.
24-
* The clone link for the flexible environment.
25-
* The clone link for the mainline environment that flexible environment is connected to.
24+
* The clone link for the flexible (source) environment.
25+
* The clone link for the mainline (target) environment that flexible environment is connected to.
2626
* An editor that provides Git tools for handling merge conflicts (like Visual Studio Code).
2727

2828
### Steps

0 commit comments

Comments
 (0)