Skip to content

Commit d099304

Browse files
committed
clean up hotfix article
1 parent bdbd83a commit d099304

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

umbraco-cloud/optimize-and-maintain-your-site/manage-product-upgrades/hotfixes/move-files-manually.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In this tutorial GitKraken has been used, however, you can use any Git GUI you p
1919

2020
You have an Umbraco Cloud project with two environments, **Development** and **Live**.
2121

22-
You have been working on building the site on a local clone of the Development environment, and now you want to send some but not all changes to the Live environment.
22+
You have been working on building the site on a local clone of the Development environment. Now, you want to send some but not all changes to the Live environment.
2323

2424
Three commits have been pushed from your local clone to the Development environment. Out of these three commits, you only need the changes from one of the commits in the Live environment.
2525

@@ -52,7 +52,7 @@ For the sake of simplicity here's an explanation of the names I'll be using in t
5252
3. Copy and paste the new and/or updated files from your Development repository to your Live repository.
5353
4. You can now _Stage_ and _Commit_ these changes to the Live repository in Git.
5454

55-
One of the benefits of having the Live environment cloned down, is that you can test the new changes locally before sending them to the Live environment.
55+
A benefit of having the Live environment cloned down, is that you can test the new changes locally before sending them to the Live environment.
5656

5757
### Test changes locally
5858

@@ -71,10 +71,12 @@ Once you've checked that everything works locally, you are ready to push to the
7171
1. Push the committed changes to the Live environment using Git.
7272

7373
{% hint style="info" %}
74+
7475
When changes are pushed directly to a Live environment and you have more than one environment, the changes are not automatically extracted to the site.
76+
7577
{% endhint %}
7678

77-
2\. Run the Deploy operation `Update Umbraco Schema From Data Files`from the Deploy Dashboard
79+
2. Run the Deploy operation `Update Umbraco Schema From Data Files`from the Deploy Dashboard
7880

7981
You have now applied a hotfix to the Live environment.
8082

umbraco-cloud/optimize-and-maintain-your-site/manage-product-upgrades/hotfixes/using-git.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ In this article, you'll find a step-by-step guide on how to apply a hotfix to a
77
{% hint style="info" %}
88
You can use whichever Git client or command line interface you prefer.
99

10-
If you've never worked with cherry-picking before, we recommend that you use a Git client with a UI that gives you a visual overview of your commits.
10+
If you've never worked with cherry-picking before, we recommend that using a Git client with visual overview of your commits.
1111
{% endhint %}
1212

1313
## The scenario
1414

1515
You have an Umbraco Cloud project with two environments, Development and Live.
1616

17-
You have been working on building the site on a local clone of the Development environment, and now you want to send some but not all changes to the Live environment.
17+
You have been working on building the site on a local clone of the Development environment. Now you want to send some but not all changes to the Live environment.
1818

1919
A set of commits have been pushed from your local clone to the Development environment. Out of these commits, you only need the changes from two of the commits in the Live environment for now.
2020

@@ -58,13 +58,15 @@ Before you push the newly created branch to Umbraco Cloud we need to change the
5858
3. You will be prompted to authenticate - use your Umbraco Cloud credentials.
5959
4. You will see that the history from the Live repository is visible in the Git history.
6060
5. Next step; hit **Push**.
61-
6. Choose to push to the newly added remote, and write **master** to make sure you are pushing to the master branch on the Live environment.
61+
6. Choose to push to the newly added remote, and write **master** to make sure you are pushing to the master branch on the Live environment.
6262

6363
![Choose remote](images/choose-remote.png)
6464
7. Hit **Submit** and the push will start.
6565

6666
{% hint style="info" %}
67+
6768
When changes are pushed directly to a Live environment and you have more than one environment, the changes are not automatically extracted into the site.
69+
6870
{% endhint %}
6971

7072
Find a guide on how to extract the files in the [Manual Extraction](../../monitor-and-troubleshoot/power-tools/manual-extractions.md) article.

0 commit comments

Comments
 (0)