|
2 | 2 | updatedLinks: true |
3 | 3 | --- |
4 | 4 |
|
5 | | -# Deploying between environments |
| 5 | +# Deploying between Environments |
6 | 6 |
|
7 | | -When your are Working in your Development environment, changes made through the Backoffice are automatically detected and committed to the site's Git repository. This includes Umbraco-specific items like Document types and templates. |
| 7 | +When you are working in your Cloud environment, changes made through the Backoffice are automatically detected and committed to the site's Git repository. This includes Umbraco-specific items like Document Types and Templates. These changes are also referred to as metadata. |
8 | 8 |
|
9 | | -Changes made on your Cloud environments will show up in the Umbraco Cloud portal. You'll be able to see what files have been added/changed and who made the changes. |
| 9 | +## Deploying between Mainline Environments |
10 | 10 |
|
11 | | -To deploy metadata changes from one Cloud environment to another, click the **'Deploy changes to ..'** button on the environment where the changes have been made. |
| 11 | +Changes made in your Cloud environments will appear in the Umbraco Cloud portal. You can see what files have been added or changed and who made the changes. |
| 12 | + |
| 13 | +To deploy metadata changes from one Cloud environment to another, click the **Deploy changes** button on the environment where the changes were made. |
12 | 14 |
|
13 | 15 | <figure><img src="../.gitbook/assets/image (39).png" alt=""><figcaption></figcaption></figure> |
14 | 16 |
|
15 | | -The deployment initiates, and you can see the process in the **Overview of your project.** |
| 17 | +The deployment starts, and you can follow the progress in the **Overview** section of your project. |
16 | 18 |
|
17 | 19 | <figure><img src="../.gitbook/assets/image (41).png" alt="Deployment in progress"><figcaption><p>Deployment in progress</p></figcaption></figure> |
18 | 20 |
|
19 | | -Once it's done, the changes will be deployed to the next Cloud environment. If you have more Cloud environments, follow the same procedure to deploy the changes up to your Live site. |
| 21 | +Once complete, the changes are deployed to the next Cloud environment in the deployment flow. If you have additional environments, repeat this process to deploy the changes through each environment. |
| 22 | + |
| 23 | +## Syncing Changes Between Mainline and Flexible Environment |
| 24 | + |
| 25 | +When working with a flexible environment alongside your mainline environments, it's important to keep them aligned to avoid conflicts and ensure consistent deployments. |
| 26 | + |
| 27 | +If any changes have been made in a mainline environment those changes must be pulled into the flexible environment before pushing updates back. The changes can be updated Document Types, content, or other schema changes. |
| 28 | + |
| 29 | + |
| 30 | + |
| 31 | +If what you've been working on in the flexible environment has also been changed in the mainline, a merge conflict will occur. These conflicts need to be resolved before you can continue with the deployment. For information on how to resolve them, see the [Merge Conflicts on Flexible Environments](../troubleshooting/deployments/merge-conflicts-on-flexible-environments.md) article. |
| 32 | + |
| 33 | +Once you’ve completed your feature or update in the flexible environment and it’s synced with the latest mainline changes: |
| 34 | + |
| 35 | +* Push your changes from the flexible environment to the mainline environment. |
| 36 | +* From there, the changes become part of the regular deployment flow. |
| 37 | + |
| 38 | + |
20 | 39 |
|
21 | 40 | ## Important Notes |
22 | 41 |
|
23 | | -When you deploy, for example, from your Development environment to your Live environment, changes are made to the Live environment. These changes will then be merged back into the Development environment. |
| 42 | +When you deploy, for example, from your left-most mainline environment to your Live environment, changes are made to the Live environment. These changes will then be merged back into the left-most mainline environment. |
24 | 43 |
|
25 | | -Here are the automatic steps Umbraco Cloud goes through when you hit the _"Deploy changes to .."_ button: |
| 44 | +Here are the automatic steps Umbraco Cloud goes through when you hit the _"Deploy changes"_ button: |
26 | 45 |
|
27 | 46 | * Before pushing your changes from the source environment, the engine running Umbraco Cloud - **Umbraco Deploy** - looks for changes in the repository on the target environment |
28 | 47 | * If changes are found, Umbraco Deploy _merges_ the changes from the target environment into the repository on the source environment. |
29 | 48 | * After the merge, the changes from the source environment are pushed to the repository on the target environment. |
30 | 49 | * Finally, the changes pushed to the target repository are extracted to the site, and you will now see your changes reflected in the Backoffice and on the Frontend. |
31 | 50 |
|
32 | | -If you have more than one Umbraco Cloud environment, we strongly recommend that you **only make changes to metadata on the Development environment**. Making changes directly on your Staging and/or Live environments can cause merge conflicts when you deploy from your Development environment. |
| 51 | +It is recommended that you **only make changes to metadata on the left-most mainline environment or a flexible environment**. Making changes directly on other mainline environments can cause merge conflicts when you deploy. |
33 | 52 |
|
34 | | -{% hint style="danger" %} |
| 53 | +{% hint style="warning" %} |
35 | 54 | It is important to be aware of how deletions work between environments. Some deletions are environment-specific and others are not. For more information see the [Deploying Deletions article](deploying-deletions.md). |
36 | 55 | {% endhint %} |
37 | 56 |
|
|
0 commit comments