No subject

"What happened was I changed a line in the code, she changed the same line in
the same code (and added another line to the code)."

Mercurial (and any other VCS for that matter) cannot know what to do
in this case, a human is needed that logically (hopefully :) )
understands both changes and makes correct decision how to merge it.

What kind of result would you expect if merge was to be automatic?

Regards,

On Thu, Mar 4, 2010 at 9:24 AM, hjazz6 <hjazz6 at ymail.com> wrote:
>
> So I'll have to manually look at the differences between the files, make the
> necessary changes, then do "hg resolve -a -m"?
>
> Why is there a conflict in the first place?
> --
> View this message in context: http://old.nabble.com/Merge-conflicts-tp27777551p27777999.html
> Sent from the Mercurial mailing list archive at Nabble.com.
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>