yade-dev team mailing list archive

[Luc Scholtes <lscholtes63@xxxxxxxxx>]

"I don't get it, sorry. What you call "basic" cycle is pull/commit/push. I
don't think this part is difficult (assuming you read from top to bottom ;)
)."

I think I can do that!?

"You did commit/pull/push.  At that point you were already not following
the instructions."

I am pretty sure I did pull/commit/push... I will be careful next time
(that's also why I just commited changes in doc BTW).

"Guess what? This page is already linked (the hyperlink on "automatic
rebase", did you click it?). I admit that the sentence on auto-rebase can
sound obscure, but the wiki is not supposed to replace git documentation +
google searches."

OK, my mistake as I replied sooner. I am a lazy person when it comes to
read documentation and follow links that bring new links, etc...

"If you think the word "mandatory" would help, feel free to add it.
I'm afraid it will not prevent similar situations to happen again... :("

I'm going to add it, or maybe simply move the autorebase line before the
pull/commit/push so that people who "read from top to bottom" won't make
the error in the future ;)

Cheers

Luc




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

>  Please Luc reply to list, not to me (you probably have a "reply to list"
> button in thunderbird, else reply to all and keep only yade-dev).
>
>
>  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).
>
>
> I don't get it, sorry. What you call "basic" cycle is pull/commit/push. I
> don't think this part is difficult (assuming you read from top to bottom ;)
> ).
> You did commit/pull/push.  At that point you were already not following
> the instructions.
>
> The wiki page is written for a reason. If you feel something is not clear,
> better ask, don't skip.
> Keep in mind that yade/trunk is shared by many, extreme care is mandatory
> when dealing with it. This is a condition for push rights.
>
> autorebase is not mandatory actually. I don't think Anton ever used it.
> You may as well forget that part and stick to the pull/commit/push.
>
>
>   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...
>
>
> Guess what? This page is already linked (the hyperlink on "automatic
> rebase", did you click it?). I admit that the sentence on auto-rebase can
> sound obscure, but the wiki is not supposed to replace git documentation +
> google searches.
>
> If you think the word "mandatory" would help, feel free to add it.
> I'm afraid it will not prevent similar situations to happen again... :(
>
> Bruno
>
>
> _______________________________________________
> 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
>
>