yade-dev team mailing list archive

[Luc Scholtes <lscholtes63@xxxxxxxxx>]

Hi Bruno,

I thought this line:

"To avoid confusing logs after each commit/pull/push cycle, it is
convenient to setup automatic
rebase<http://www.stevenharman.net/git-pull-with-automatic-rebase>:
"

was not mandatory. It only appears after the "basic" pull, commit, push
procedure and it is far from clear what it means (maybe just for me though).

Maybe, we should insist on saying that "automatic rebase" (whatever that
means), is mandatory to avoid "merge bubbles". Maybe we could indicate this
page (http://stevenharman.net/git-pull-with-automatic-rebase) to explain
why this method id necessary...

git config -l gives me that:

user.name=Luc Scholtes
user.mail=lscholtes63@xxxxxxxxx
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git@xxxxxxxxxx:yade/trunk.git
branch.master.remote=origin
branch.master.merge=refs/heads/master

Luc


2013/7/18 Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>

>  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     : yade-dev@xxxxxxxxxxxxxxxxxxx
> 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     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp
>
>