Skip to content

Commit 5e83822

Browse files
Review
1 parent 59c0bee commit 5e83822

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

  • content/en/docs/refguide/version-control/using-version-control-in-studio-pro

content/en/docs/refguide/version-control/using-version-control-in-studio-pro/_index.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ Select a revision to see additional details, such as related stories, changed do
203203

204204
In case you want to undo changes that have been made, it is important to understand the difference between uncommitted changes, and committed changes that have been pushed to the server. Uncommitted work can simply be reverted, while committed work requires a new **Reverse commit** to undo.
205205

206-
### Revert Uncommitted Changes
206+
### Reverting Uncommitted Changes
207207

208-
Changes that have not yet been committed can be reverted. Say, for example, that you have made a lot of changes to a page and you are not happy with the result. You can revert the page to the original state, that is, the state of the page before you started making changes.
208+
Changes that have not yet been committed can be reverted. For example, that you have made a lot of changes to a page and you are not happy with the result. You can revert the page to the original state, that is, the state of the page before you started making changes.
209209

210210
Deletes of documents, folders, and modules can also be reverted. This brings them back into the app. Note that you will get back the latest version you have committed. For example, if you commit, make some changes to a microflow, and then delete the microflow, reverting the delete restores the microflow without the changes that you made.
211211

@@ -214,31 +214,30 @@ You can revert changes in the **Changes** pane, from **Version Control** > **Rev
214214
{{< figure src="/attachments/refguide/version-control/using-version-control-in-studio-pro/revertx2.png" alt="Two ways of reverting" class="no-border" >}}
215215

216216
{{% alert color="info" %}}
217-
You can also **Revert All Changes** while [merging](#merge). This will restore your app to the most recent, discarding changes creating by the merging process.
217+
You can also **Revert All Changes** while [merging](#merge). This will restore your app to the most recent commit, discarding changes creating by the merging process.
218218
{{% /alert %}}
219219

220-
### Revert a Previous Commit
220+
### Reverting a Previous Commit
221221

222-
Changes that have been committed and pushed to the server can never be deleted from the history. However, you can make another commit to revert the changes. This feature is called **Reverse commit** in Studio Pro.
222+
Changes that have been committed and pushed to the server can never be deleted from the history. However, you can make another commit to revert the changes. This is called **Reverse commit** in Studio Pro.
223223

224-
Choose the **Version Control** menu > **Revert a Commit...** to revert a commit. This will create the original changes 'in reverse', which you can commit and push to the server.
224+
Select the **Version Control** menu > **Revert a Commit...** to revert a commit. This will create original changes "in reverse", which you can commit and push to the server.
225225

226226
{{% alert color="warning" %}}
227227
Reverting a commit creates a new commit that undoes the changes introduced by the original commit. This may lead to unexpected results depending on the context of the original commit.
228-
229-
* **Port fix and reverting:** If you used [Port Fix](/refguide/merge-dialog/#port-fix) to apply a commit from another branch to the current branch, and then you revert that commit, the changes from the cherry-pick will not be applied again if you later merge the entire branch. This is because the revert commit explicitly undoes the changes from the cherry-picked commit, and Git recognizes that these changes have already been handled.
230-
* **Merging and reverting:** If you [Merged another branch](/refguide/version-control/#merging-branches) into the current branch and then reverted the merge commit, the changes from the merge will not be reapplied if you merge the branch again. This is because the revert commit undoes the changes introduced by the merge commit, and Git recognizes that the changes have already been integrated and reverted.
228+
* **Port fix and reverting** – If you used [Port Fix](/refguide/merge-dialog/#port-fix) to apply a commit from another branch to the current branch, and then you revert that commit, the changes from the cherry-pick will not be reapplied when merging the full branch. This happens because the revert commit explicitly negates the cherry-picked changes, and Git recognizes them as already addressed.
229+
* **Merging and reverting** – If you [merged another branch](/refguide/version-control/#merging-branches) into the current branch and then reverted the merge commit, merging the same branch again will not reapply its changes. Git identifies that the merge was undone and prevents those changes from being reapplied.
231230
{{% /alert %}}
232231

233-
Reverting changes is done with one commit at a time. If you want to revert multiple commits, you can do that by reverting the latest commit, then the previous one, only one by one.
232+
Reverting changes is done with one commit at a time. If you want to revert multiple commits, you can do that by reverting the latest commit, then the previous one, etc, one by one.
234233

235234
{{< figure src="/attachments/refguide/version-control/using-version-control-in-studio-pro/revert-changes-git.png" class="no-border" >}}
236235

237-
#### Reverse Merge
236+
#### Reverse Merging
238237

239-
You can also choose to revert a commit in which another branch was merged into the current branch. If you revert the merge, the app will look like the changes never happened: if you reverse merge adding a new page, the page will be deleted locally.
238+
You can also revert a commit where another branch was merged into the current branch. Reverting a merge removes the changes introduced by that merge, making it appear as if they never happened. For example, if the merge added a new page, reverting it will remove the page locally.
240239

241-
Just like when you are doing a normal merge, conflicts can arise. For example, if later commits change the new page, the reverse merge will result in a conflict. After resolving the conflict, you can commit and push the results to the remote repository.
240+
Just like with a normal merge, conflicts can occur when reverting a merge. For example, if later commits change the new page, the reverse merge will result in a conflict. Once you resolved the conflict, you can commit the changes and push them to the remote repository.
242241

243242
## Dealing With Conflicts {#conflicts}
244243

0 commit comments

Comments
 (0)