Mercurial > hg-website
comparison text/learning_mercurial_in_workflows.txt @ 126:9655e0018355
Added a resolve part for merging.
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Fri, 01 May 2009 13:51:27 +0200 |
| parents | ea1289ecb35e |
| children | 98ba6ac8ac93 |
comparison
equal
deleted
inserted
replaced
| 125:ea1289ecb35e | 126:9655e0018355 |
|---|---|
| 158 Merge feature1 into the project code: | 158 Merge feature1 into the project code: |
| 159 | 159 |
| 160 $ hg merge | 160 $ hg merge |
| 161 | 161 |
| 162 If there are conflicts use "hg resolve" - that's also what merge tells you to do in case of conflicts. | 162 If there are conflicts use "hg resolve" - that's also what merge tells you to do in case of conflicts. |
| 163 | |
| 164 First list the files with conflicts: | |
| 165 | |
| 166 $ hg resolve --list | |
| 167 | |
| 168 Then resolve them one by one. "resolve" attempts the merge again: | |
| 169 | |
| 170 $ hg resolve conflicting_file | |
| 171 (fix it by hand, if necessary) | |
| 172 | |
| 173 Mark the fixed file as resolved: | |
| 174 | |
| 175 $ hg resolve --mark conflicting_file | |
| 176 | |
| 177 Commit the merge, as soon as you resolved all conflicts. This step is also necessary if there were no conflicts! | |
| 163 | 178 |
| 164 $ hg commit -m "merged feature1" | 179 $ hg commit -m "merged feature1" |
| 165 | 180 |
| 166 You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your work at home and at work. | 181 You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your work at home and at work. |
| 167 | 182 |