Subject: Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (110be86beb50cbc2989b7e1fd1c85c97c3a35dab)
Date: Thu, 1 Apr 2010 10:20:41 +0900
flux (flux AT sourcemage.org) wrote [10.04.01 07:09]:
> The emails have nothing to do with the commits themselves. Currently our
> emails are generated per-push rather than per-commit (there is an open
> bug about this, bug #). As long as the commits are all there (a merge
> of branches preserves individual commits, so long as they don't cause
> conflicts, otherwise you'd have to fix the conflicts and create new
> commits) there shouldn't be any problems because each separate commit
> could still be reverted (as well as the merge as a whole). In my
> opinion, merging in one operation is the sane way to do it.
Sorry, that should say bug #14832 there.
--
Justin "flux_control" Boffemmyer
Cauldron wizard and general mage
Source Mage GNU/Linux http://www.sourcemage.org