From: Ladislav Hagara <ladislav.hagara AT unob.cz>
Cc: "sm-commit AT lists.ibiblio.org" <sm-commit AT lists.ibiblio.org>
Subject: Re: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (078aedbc624091ae85d8c2991ffde888348befcc)
Date: Sat, 30 Jan 2010 21:41:52 +0100
>> As another Lead, I'd say the HISTORY entry should be added back.
>> Generally it's whomever commits *and* pushes first that gets to keep
>> their entry, everyone else will have to merge the conflicts and accept
>> upstream (whatever is pushed to our central servers) as the master
>> copy. If someone's commit is less correct than yours, you may revert
>> their change and use your commit.
>>
>> All IMO, of course. :)
>>
>> -sandalle
>>
>>
>
> Well, my commit was correct but incomplete.