yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>]

Was there really a conflict commited? Git is not supposed to allow that,
is it?

I agree with Anton theoretically. Unfortunately, it is not always
realistic to pull between each commits.
If somebody is spending a full day on the code and will make 5 or 6
commits, and if at the same time other devs are pushing changes to core
files, then a pull between each commit means recompiling everything 5
times, i.e. 3h of compilation time on an average desktop. It would be
killing productivity completely.
Also, sometimes, you commit a trivial thing (e.g. fix a typo) and don't
push immediatly to minimize gitHub traffic. Then you come the day after
and somebody pushed something to the trunk in the meantime. Then
practically you commited before pulling (not true in the sense of human
time, but true in git's sense).

So, if you don't pull between each commit, make sure to pull with
"rebase", as indicated in the wiki
(https://yade-dem.org/wiki/Yade_on_github).
It will avoid the ugly merge bubbles like this one:
https://github.com/yade/trunk/commit/a3dcfbece454b16450e2e1a97b27029f8b18b0ba

Jan, could you explain your procedure, so we can understand the relation
between what you are doing and what we see on gitHub?
Did you actually commit something in the merge I'm mentioning above? Did
you set autorebase?
There are still many events unclear to me. People here have similar
troubles sometimes. They send merge bubbles even with rebase, or they
push something which never appear.

We have 50% of junk git activity on gitHub in the last 3 days
(https://github.com/yade/trunk/commits/master).
One merge is from me: I still didn't find the way to avoid this when you
commit/pull/fix conflict/push. There need to be a merge somewhere in
this sequence (according to git error messages).
Any idea Anton? I've been reading a lot of git documentation now, but
still no clue if it is only possible to avoid all those merges.

Fixing the conflicts is also a bit tricky. I miss the "edit + bzr
resolve" big time.

Bruno



On 30/11/12 16:38, Anton Gladky wrote:
> Hi all,
>
> please, do "git pull" before commiting. Check, whether everything was
> smoothly merged and then
> commit and push. No conflicts should be pushed into the main branch.
>
> Thanks,
>
> Anton
>
> _______________________________________________
> 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
________________