annotate help/a-21.html @ 530:2262f753b19e
Add more useful message for merge with working directory ancestor
| author |
Chris Cannam |
| date |
Wed, 23 Nov 2011 11:24:23 +0000 |
| parents |
21aa41b62c3a |
| children |
|
| rev |
line source |
|
Chris@496
|
1 <link rel="stylesheet" type="text/css" href="help.css"/>
|
|
Chris@496
|
2
|
|
Chris@496
|
3
|
|
Chris@496
|
4 <h2>I have changed some files and I want to record the changes</h2>
|
|
Chris@496
|
5
|
|
Chris@496
|
6 <p>Click the Commit button in the toolbar on the left to commit all of
|
|
Chris@496
|
7 the changes you have made to tracked files in your working folder.
|
|
Chris@496
|
8 That is, all files listed as <b>“Modified”</b>, <b>“Removed”</b>, or <b>“Added”</b>
|
|
Chris@496
|
9 under “My Work”.</p>
|
|
Chris@496
|
10
|
|
Chris@496
|
11 <p>(If the files you have changed are still listed as <b>“Untracked”</b>, then
|
|
Chris@496
|
12 you must add them before you can commit. See <a href="a-20.html">I've added a new file...</a>.</p>
|
|
Chris@496
|
13
|
|
Chris@496
|
14 <p>When you commit your changes, you will be asked for a commit message
|
|
Chris@496
|
15 which will accompany that change set in the history. Enter something
|
|
Chris@496
|
16 that will help you remember – and other readers understand – what
|
|
Chris@496
|
17 you have changed and why.</p>
|
|
Chris@496
|
18
|
|
Chris@496
|
19 <p>If you want to commit only some files, right-click on them in the list
|
|
Chris@496
|
20 and choose Commit from the context menu.
|
|
Chris@496
|
21 <ul><li>Note: the equivalent Mercurial command for this is <b>hg commit</b></li></ul></p>
|
|
Chris@496
|
22
|
