Commit and combine #9097
Commit and combine #9097
Conversation
|
|
||
| #### Commit and Combine {#combine} | ||
|
|
||
| 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: |
There was a problem hiding this comment.
I think it's good to mention that this also creates a local commit, and that it does a merge with possible conflict resolution.
Some input:
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 dialog box. Commit and Combine will first create a local commit and then automatically do a pull. After resolving any conflicts if necessary, you can push the merged version to the server.
There was a problem hiding this comment.
I do see a mention of 'local copy' also in the warning on line 51. I would suggest to use 'local commit' as 'local copy' to mean doesn't say anything about the committed-state, and since 'commit' used to have a different function in SVN, it's probably good to mention.
|
|
||
| #### Commit and Push | ||
|
|
||
| Your changes are committed and pushed to the server. |
There was a problem hiding this comment.
Please add that this is the recommended flow, to stay in-sync with your peers and prevent conflicts as much as possible.
No description provided.