Skip to content

Commit 0b0bc2e

Browse files
Review the Commit dialog
1 parent d7009fb commit 0b0bc2e

6 files changed

Lines changed: 12 additions & 13 deletions

File tree

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ weight: 20
88

99
The commit dialog is used for committing changes to the Team Server. You can enter a message and, if applicable, select related stories.
1010

11-
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-dialog-stories.png" alt="Version Control Menu" class="no-border" width="400" >}}
12-
1311
## Branch
1412

1513
At the top of the dialog box you will see the branch which you are committing. This will be one of the following:
1614

1715
| Branch Description | Notes |
1816
| --- | --- |
19-
| {{< 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 |
20-
| {{< 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 |
17+
| {{< 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 |
18+
| {{< 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 |
2119

2220
## Message
2321

@@ -27,17 +25,15 @@ Enter a message describing the changes you have made. This message may contain m
2725

2826
### Related Stories {#stories}
2927

30-
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-dialog-stories.png" alt="Version Control Menu" class="no-border" width="400" >}}
31-
3228
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.
3329

3430
### Changes in Model
3531

36-
{{< 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" >}}
37-
3832
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/).
3933

40-
There are several scenarios and options that you can choose when committing.
34+
There are several scenarios and options that you can choose when committing. Two of these options are represented in the image below:
35+
36+
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-options.jpg" alt="Several options when committing" >}}
4137

4238
#### Commit and Push
4339

@@ -49,14 +45,17 @@ Changes are committed to your local working copy and are not pushed to the sever
4945

5046
#### Commit and Combine {#combine}
5147

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.
48+
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:
49+
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-and-combine.jpg" alt="Commit and combine changes" >}}
50+
51+
{{% alert color="warning" %}}
5352

5453
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.
5554

56-
### Changes on Disk
55+
{{% /alert %}}
5756

58-
{{< 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" >}}
57+
### Changes on Disk
5958

60-
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.
59+
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.
6160

6261
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.
72.7 KB
Loading
45.5 KB
Loading

0 commit comments

Comments
 (0)