=== rvba` is now known as rvba
=== Guest14568 is now known as jelmer
=== jelmer is now known as Guest86703
=== Peng is now known as Peng_
=== Peng__ is now known as Peng
[22:51] <josharenson> I merged a branch and committed (revision #3). The merge was bad, so I reverted to revision 2 and committed. Now I'm at revision #4 and I can't attempt the merge again as bzr says "Nothing to do." How can I fix this?
[22:52] <fullermd_> You didn't want to revert to 2, you wanted to rewind to 2.
[22:53] <fullermd_> If that's actually all you've done (there are no other changes in the middle you care about), you can just go ahead and rewind now.
[22:55] <josharenson> fullermd_: I tried what is listed here https://answers.launchpad.net/bzr/+question/45980 but now I have 51 conflicts
[22:56] <fullermd_> I'd normally use pull.
[22:57] <fullermd_> (assuming again you really are talking about 2/3/4, and there's nothing between 3 and 4 you need to keep), `bzr pull -r2 --overwrite .` and then do the merge.
[22:57]  * josharenson tries that
[22:57] <fullermd_> Uncommit I always have to look up details and do scratch experiments with, for anything but the simple "pop last" usecase.
[22:58] <fullermd_> You want to make it like 3 never happened.  Revert just changes the file contents.
=== fullermd_ is now known as fullermd
[22:58] <josharenson> fullermd: I think that did exactly what I wanted, thanks
[23:00] <josharenson> There are only 20 conflicts now :-)  (which is what there was before, and why the merge went badly)
[23:02] <fullermd> If things go poorly resolving them, you can always just 'revert' (with no args) before you commit it to try again clean.