Merge pull request mendix#9097 from mendix/Maria_commit-and-combine

Commit and combine

Author: MariaShaposhnikova

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

@@ -8,16 +8,14 @@ weight: 20
 
 The commit dialog is used for committing changes to the Team Server. You can enter a message and, if applicable, select related stories.
 
-{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-dialog-stories.png" alt="Version Control Menu" class="no-border" width="400" >}}
-
 ## Branch
 
 At the top of the dialog box you will see the branch which you are committing. This will be one of the following:
 
 | Branch Description | Notes |
 | --- | --- |
-| {{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-main.png" alt="Version Control Menu" class="no-border" >}} |  you are committing the main line |
-| {{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-branch.png" alt="Version Control Menu" class="no-border" >}} |  you are committing the specified branch |
+| {{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-main.png" alt="Main line icon" class="no-border" >}} |  you are committing the main line |
+| {{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-branch.png" alt="Commit branch icon" class="no-border" >}} |  you are committing the specified branch |
 
 ## Message
 
@@ -27,20 +25,44 @@ Enter a message describing the changes you have made. This message may contain m
 
 ### Related Stories {#stories}
 
-{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-dialog-stories.png" alt="Version Control Menu" class="no-border" width="400" >}}
-
 Tick the boxes next to the stories that are related to your commit. Mendix recommends committing a small number of changes at a time, so there is usually just one related story.
 
 ### Changes in Model
 
-{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-dialog-model-changes.png" alt="Version Control Menu" class="no-border" width="400" >}}
-
 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/).
 
-### Changes on Disk
+There are several scenarios and options that you can choose when committing. Two of these options are represented in the image below:
+
+{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-options.jpg" alt="Several options when committing" >}}
+
+#### Commit and Push
+
+{{% alert color="info" %}}
+
+**Commit and Push** is the recommended flow to stay in-sync with your team and avoid conflicts.
+
+{{% /alert %}}
+
+Your changes are committed and pushed to the server.
 
-{{< 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" >}}
+#### Commit Locally
+
+Changes are committed to your local working copy and are not pushed to the sever.
+
+#### Commit and Combine {#combine}
+
+If someone else committed a change since the last time you pulled your branch, you will have to pull and merge their changes before you can push to the server. This process is called **Commit and Combine** in the [Commit](/refguide/commit-dialog/) dialog box. **Commit and Combine** will first create a local commit and then automatically do a pull. After resolving any conflicts, you can push the combined version to the server.
+
+{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-and-combine.jpg" alt="Commit and combine changes" >}}
+
+{{% alert color="warning" %}}
+
+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. 
+
+{{% /alert %}}
+
+### Changes on Disk
 
-If there are changes on disk this page shows a summary of those changes. Click **Open containing folder** to open the folder containing the selected file in Windows Explorer.
+If there are changes on disk this tab shows a summary of those changes. Click **Open containing folder** to open the folder containing the selected file in Windows Explorer.
 
 The tab page is hidden if there are no disk changes. Often, there are model changes but the only change on disk is the app file (*.mpr*) reflecting these model changes. In this case, it is also hidden, because it does not add useful information.

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

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