Luc, Your first commit is a merge bubble (http://stevenharman.net/git-pull-with-automatic-rebase). The instructions from our wiki should be enough to avoid that and I insisted on reading them. Did you skip some parts? If so why? If not, we will have to find what is missing.
https://yade-dem.org/wiki/Yade_on_github section "Working directly on git/trunk" Can you send the output of this command (typed in the trunk folder): git config -l Bruno On 17/07/13 17:58, Luc Scholtes wrote: > Hi there, > > Could you please allow me to commit on the master branch? My git user > name is lucScholtes. > > Many thanks > > Luc > > > > > > > _______________________________________________ > 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
