rebase usability

[Benjamin Fritz]

On Mon, Nov 24, 2014 at 9:33 AM, anatoly techtonik <techtonik at gmail.com>
wrote:

> I realize that I removed these lines, but I don't get where and why
> there is conflict? Somebody added them or what? How to see the exact
> changes that cause the conflict from each side?
>

Forgive me if this is too obvious a question, but maybe the changes between
when you started working, and the current changeset you're rebasing to,
modified a line you deleted? That's a real conflict you'd need to resolve.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20141125/2dfcd74b/attachment-0002.html>