Mercurial > hg-website
comparison text/learning_mercurial_in_workflows.txt @ 115:8a603a9cbc04
learning in workflows: Minor addition to backout.
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Fri, 24 Apr 2009 10:30:27 +0200 |
| parents | 8b51ceb2d36b |
| children | 0bee8982f334 |
comparison
equal
deleted
inserted
replaced
| 114:aa325d9f79cd | 115:8a603a9cbc04 |
|---|---|
| 404 $ hg merge | 404 $ hg merge |
| 405 (potentially resolve conflicts) | 405 (potentially resolve conflicts) |
| 406 $ hg commit | 406 $ hg commit |
| 407 (enter commit message. For example: "merged backout") | 407 (enter commit message. For example: "merged backout") |
| 408 | 408 |
| 409 That's it. You reversed the bad change. | 409 That's it. You reversed the bad change. It's still recorded that it was once there (don't rewrite history, if it's not really necessary), but it doesn't affect future code anymore. |
| 410 | 410 |
| 411 == Collaborative feature development == | 411 == Collaborative feature development == |
| 412 | 412 |
| 413 -> branches | 413 -> branches |
| 414 | 414 |