Skip to content

Commit d7009fb

Browse files
Add a high-level description of changes
1 parent 987bd0b commit d7009fb

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

  • content/en/docs/refguide

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,22 @@ Tick the boxes next to the stories that are related to your commit. Mendix recom
3737

3838
If there are changes in the model this tab shows a summary of those changes. For more information on how changes are reported in Studio Pro, see [Changes Pane](/refguide/changes-pane/).
3939

40+
There are several scenarios and options that you can choose when committing.
41+
42+
#### Commit and Push
43+
44+
Your changes are committed and pushed to the server.
45+
46+
#### Commit Locally
47+
48+
Changes are committed to your local working copy and are not pushed to the sever.
49+
50+
#### Commit and Combine {#combine}
51+
52+
If someone else committed a change since the last time you pulled your branch, you will have to pull first. This process is called **Commit and Combine** in the [Commit](/refguide/commit-dialog/) dialog box. **Commit and Combine** will update your local working copy.
53+
54+
After you reviewed the changes, you will need to push your changes, as **Commit and Combine** only updates your local copy and does not push your changes to the server.
55+
4056
### Changes on Disk
4157

4258
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-dialog-disk-changes.png" alt="Version Control Menu" class="no-border" width="400" >}}

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
@@ -143,7 +143,7 @@ A tool you can consider using is TortoiseGitMerge, shipped as part of [TortoiseG
143143
Comparing files on disk with the original is currently not supported on macOS.
144144
{{% /alert %}}
145145

146-
Committing is only allowed if your working copy is up to date with the repository. If someone else committed a change since the last time you pulled, you will have to pull first. This is because the revision you create with the commit should incorporate both your changes and the changes by the other person. Updating will combine the latest changes in the repository with your changes. After reviewing the result and fixing any conflicts, you can commit again.
146+
Committing is only allowed if your working copy is up to date with the repository. If someone else committed a change since the last time you pulled, you will have to pull first (this process is called **Commit and Combine** in the [Commit](/refguide/commit-dialog/#combine) dialog box). This is because the revision you create with the commit should incorporate both your changes and the changes by the other person. Updating will combine the latest changes in the repository with your changes. After reviewing the result and fixing any conflicts, you can commit again.
147147

148148
### Pushing {#pushing}
149149

0 commit comments

Comments
 (0)