[Ecls-list] Fixes for the current git master, MSVC and not.

Samium Gromoff _deepfire at feelingofgreen.ru
Thu Oct 30 15:39:14 UTC 2008


From: "Juan Jose Garcia-Ripoll" <juanjose.garciaripoll at googlemail.com>
> > On an unrelated note -- do you prefer submissions via patches or
> > via git branches?
> 
> Definitely via patches. The branches force me to keep track of your
> sources and guess which changes are already in my tree and which are
> not.

I'll resubmit as patches.

Although, I can't avoid but note, that whenever my branch is a
strict superset of yours (which I announce) it is invariant
that the merging with you is already done[1], so it is impossible
for some changes to independently exist in both branches.

This, of course, conveniently ignores the fact that there is a
time window, between myself arranging my branch as a superset of
yours and sending you a mail, and you receiving that mail
and deciding to act upon it.

And it is in that time window (arguably narrow), when you might have
introduced potentially conflicting commits.

Did you have that in mind?


regards, Samium Gromoff


1. This conveniently sets aside your unpublished changes, i.e.
whatever sits in your git index or working tree. 




More information about the ecl-devel mailing list