yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxxxxxx>]

Hi Chao,
This is git's merge bubble, an expected behavior if you did not set 
git's "autorebase" as indicated in yade install page.
I don't think it needs a revert, but please set autorebase for next commits.
Cheers
Bruno

On 04/07/2018 02:08 AM, Chao YUAN wrote:
> Hi guys,
> I guess I did something wrong on git commit. Could someone help to 
> revert this?
> https://github.com/yade/trunk/commit/167aca14a6f151b331d8f60c6e63b16d0104f2a5 
>
> Thanks. I am very sorry for the dangerous merge.
>
> regards,
> chao
>
> _______________________________________________
> 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