You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/en/docs/refguide/modeling/menus/version-control-menu/commit-dialog.md
+12-13Lines changed: 12 additions & 13 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,16 +8,14 @@ weight: 20
8
8
9
9
The commit dialog is used for committing changes to the Team Server. You can enter a message and, if applicable, select related stories.
10
10
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
-
13
11
## Branch
14
12
15
13
At the top of the dialog box you will see the branch which you are committing. This will be one of the following:
16
14
17
15
| Branch Description | Notes |
18
16
| --- | --- |
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 |
21
19
22
20
## Message
23
21
@@ -27,17 +25,15 @@ Enter a message describing the changes you have made. This message may contain m
27
25
28
26
### Related Stories {#stories}
29
27
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
-
32
28
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.
33
29
34
30
### Changes in Model
35
31
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
-
38
32
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/).
39
33
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" >}}
41
37
42
38
#### Commit and Push
43
39
@@ -49,14 +45,17 @@ Changes are committed to your local working copy and are not pushed to the sever
49
45
50
46
#### Commit and Combine {#combine}
51
47
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" %}}
53
52
54
53
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
54
56
-
### Changes on Disk
55
+
{{% /alert %}}
57
56
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
59
58
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.
61
60
62
61
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.
0 commit comments