[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (078aedbc624091ae85d8c2991ffde888348befcc)
eric at sandall.us
Sat Jan 30 12:44:43 EST 2010
On Mon, 25 Jan 2010 02:41:30 +0100
Ladislav Hagara <ladislav.hagara at unob.cz> wrote:
> >>> It was my commit, and since i maintain the spell, i didn't want
> >>> to make the merges. It was just easier.
> >> Easier is not equal to correct in this case. When several people
> >> were updating the gnome spells without first talking to Robin, he
> >> didn't revert all their commits and pretend that he was the only
> >> one doing the work. He merged his work with what others had pushed
> >> up. That's for an entire section, not one spell, and involved a
> >> lot more changes (real conflicts, not just adding his work on top
> >> of others).
> > weird Vlad...
> So who will fix the HISTORY file?
> Imho, Pol should me mentioned there.
> What are the opinions of our PL and GL?
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. :)
Eric Sandall | Source Mage GNU/Linux Developer
eric at sandall.us PGP: 0xA8EFDD61 | http://www.sourcemage.org/
http://eric.sandall.us/ | http://counter.li.org/ #196285
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 198 bytes
Desc: not available
Url : http://lists.ibiblio.org/pipermail/sm-commit/attachments/20100130/0fee50a2/attachment.bin
More information about the SM-Commit