Comment 1 for bug 228506

Hi,

There are a couple of things going on here, and I'm not entirely
sure what is going on.

Firstly, I agree that "add" could be confusing here, "creating" could
be a better word to use.

Secondly, the it has trouble creating them as they already exist for
some reason. I haven't worked out how that could happen yet,
but it's possible that they could still be around from a previous
conflict.

Lastly, if you run status after this then you are told that there
are also conflicts for the "BASE" etc. files. Do I really need to
resolve those conflicts before committing? I don't even really
know what a sensible resolution for these conflicts would be.

Thanks,

James