No subject

stuck with a conflict that 1) he doesn't know how to resolve and 2) has
already been resolved anyways.

Thoughts?  I'm still trying to figure out if this is a bug in Mercurial,
a feature request for Mercurial ("handle this case better!"), or a flaw
in our workflow.  I'm pretty sure we could avoid it much of the time
with rebase, but that won't always work.  (We have multi-level workflow,
and obviously you should not rebase changesets that you have already
pushed.)

Thanks --

Greg