Luc pulled before setting autorebase. It'll be ok next time. Bruno p.s. there was a typo in checkGravity, just fixed
On 16/04/14 19:35, Anton Gladky wrote: > Please, do not revert it. It is dangerous. > Just double check next time, whether autorebase > is switched on. > > Regards > > > Anton > > > 2014-04-16 19:30 GMT+02:00 Luc Sibille <[email protected] > <mailto:[email protected]>>: > > Thank you Bruno, > Yes It works, however after a first push, this one was once again > rejected and it was ask me to make a pull before the push. > Consequently I made a pull and then a push, and now my example > have been pushed but with many other changes.... > Thus I will try to revert this push... sorry :-( > Best > Luc > > Le 16/04/2014 18:46, Bruno Chareyre a écrit : > > lsibille added to devs. Try again? > > Let me recall a few guidelines before pushing to trunk (I'll > paste this > on the wiki page): > 0- inspect the diff to make sure you will not commit junk code > (typically some "cout<<" left here and there) > 1- commit selectively: > git commit file1 file2 file3 -m "message" <--- good > git commit -a -m "message" <---- bad, best way to commit > things that > should not be commited > 2- make sure it compiles > 3- try "yade --test" > 4- try "yade --check" > 5- set autorebase once on the computer [1] > 5- git push > > Cheers > > Bruno > > [1] as explained on wiki: > git config --global branch.autosetuprebase always > > > > On 16/04/14 18:00, Luc Sibille wrote: > > Hi Yade dev. > To avoid to make pull requests on github, I tried to push > directly a LBM script example on Yade's git/trunk, however > I obtained the following message: > > lsibille@dt-med008:~/YADE_Mtrunk/trunk$ git push > ERROR: Permission to yade/trunk.git denied to lsibille. > fatal: The remote end hung up unexpectedly > > I guess it is because I am not included in the yade-dev > team? Thus could I join the yade-dev team and push > directly in the trunk? > > Best, > Luc > > > > -- > Luc Sibille > Université Joseph Fourier / IUT1 de Grenoble > Laboratoire 3SR UMR CNRS > > Tel lab.: +33 (0)4 76 82 63 48 > Tel IUT: +33 (0)4 76 82 53 36 > > > > _______________________________________________ > Mailing list: https://launchpad.net/~yade-dev > <https://launchpad.net/%7Eyade-dev> > Post to : [email protected] > <mailto:[email protected]> > Unsubscribe : https://launchpad.net/~yade-dev > <https://launchpad.net/%7Eyade-dev> > More help : https://help.launchpad.net/ListHelp > > > > > _______________________________________________ > Mailing list: https://launchpad.net/~yade-dev > Post to : [email protected] > Unsubscribe : https://launchpad.net/~yade-dev > More help : https://help.launchpad.net/ListHelp -- _______________ Bruno Chareyre Associate Professor ENSE³ - Grenoble INP Lab. 3SR BP 53 38041 Grenoble cedex 9 Tél : +33 4 56 52 86 21 Fax : +33 4 76 82 70 43 ________________
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
