Skip to content

Commit 2e4286b

Browse files
Implement comments
1 parent 0b0bc2e commit 2e4286b

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ There are several scenarios and options that you can choose when committing. Two
3737

3838
#### Commit and Push
3939

40+
{{% alert color="info" %}}
41+
42+
**Commit and Push** is the recommended flow to stay in-sync with your team and avoid conflicts.
43+
44+
{{% /alert %}}
45+
4046
Your changes are committed and pushed to the server.
4147

4248
#### Commit Locally
@@ -45,7 +51,8 @@ Changes are committed to your local working copy and are not pushed to the sever
4551

4652
#### Commit and Combine {#combine}
4753

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:
54+
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.
55+
4956
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/commit-dialog/commit-and-combine.jpg" alt="Commit and combine changes" >}}
5057

5158
{{% alert color="warning" %}}

0 commit comments

Comments
 (0)