yade-dev team mailing list archive

[Kneib François <francois.kneib@xxxxxxxxx>]

Hi,

Unfortunately the actual version of pack.py seems to be a wrong merged 
file. The correct version should be bruno's one, pushed 5 days ago 
(e1ed75d9b987724083769dd8109479d4f66d86ef).
The code as it is on github today has no compilation problem but there 
is a python error when launching Yade (and probably the clump issue is 
not solved).

François

Le 03/12/2012 09:31, Anton Gladky a écrit :
> 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
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp