yade-dev team mailing list archive

[Anton Gladky <gladky.anton@xxxxxxxxx>]

2012/11/30 Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>:
> Was there really a conflict commited? Git is not supposed to allow that,
> is it?

http://www.mail-archive.com/yade-dev@xxxxxxxxxxxxxxxxxxx/msg08399.html

Log Message:
  -----------
  Merge remote branch 'origin'

Conflicts:
        py/pack/pack.py

When you committed, it was ok. The problem appeared, when you merged
your branch with
already committed stuff.

Anton