Skip to content

Commit bc7d0e7

Browse files
authored
Merge pull request #10517 from mendix/MvM-DuplicateMerges10498
Clarify Git handling during merge
2 parents 53cecc2 + dc99fbe commit bc7d0e7

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

  • content/en/docs/refguide

content/en/docs/refguide/modeling/menus/version-control-menu/merge-dialog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ To access the **Merge** dialog box, open [Version Control](/refguide/version-con
1616

1717
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/merge-dialog/merge-dialog.png" alt="Merge Dialog" class="no-border" >}}
1818

19+
{{% alert color="info" %}}
20+
Git ensures that changes are applied in the correct order and are not duplicated. This may lead to unexpected results if your branch reverts a previous commit. See [Reverting Uncommitted Changes](/refguide/using-version-control-in-studio-pro/#revert-previous-commit) in *Using Version Control in Studio Pro* for more information.
21+
{{% /alert %}}
22+
1923
Available scenarios are described in sections below.
2024

2125
## Cherry Pick

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ You can revert changes in the **Changes** pane, from **Version Control** > **Rev
223223
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.
224224
{{% /alert %}}
225225

226-
### Reverting a Previous Commit
226+
### Reverting a Previous Commit {#revert-previous-commit}
227227

228228
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.
229229

0 commit comments

Comments
 (0)