comparison hgscm/templates/workflow_guide.html @ 196:f56228c27391

workflow guide: changed 'we' to 'you' in one more place.

195:5bc5fe45852a

<p>Note: The basic commands don't directly rewrite history. If you want to do that, you need to activate some of the extensions which are shipped with mercurial. We'll come to that later on.</p>

<h3>Workflow</h3>

<p>Let's assume the bad change was revision 3, and we already have one more revision in our repository. To remove the bad code, we just <hg>backout</hg> of it. This creates a new change which reverses the bad change. After backing out, we merge that new change into the current code.</p>

<pre>$ hg backout 3
$ hg merge
(potentially resolve conflicts)
$ hg commit 

196:f56228c27391

<p>Note: The basic commands don't directly rewrite history. If you want to do that, you need to activate some of the extensions which are shipped with mercurial. We'll come to that later on.</p>

<h3>Workflow</h3>

<p>Let's assume the bad change was revision 3, and you already have one more revision in your 
repository. To remove the bad code, you can just <hg>backout</hg> of it. This creates a new 
change which reverses the bad change. After backing out, you can then merge that new change 
into the current code.</p>

<pre>$ hg backout 3
$ hg merge
(potentially resolve conflicts)
$ hg commit