Imho, I would say "better too much merges than too few"! ;)
On 07/08/2013 16:00, Gavin Howard wrote: > Thomas, > > I know that I have been merging a lot. Maybe it's because of my bad > experience previously where a merge went wrong and I had to reset my > branch. Usually, the metric I use is how many files were changed, and since > Campbell was doing code cleanup, a lot of files were getting changed. > > So, sorry. I'll try to be less scared of merging in the future. But perhaps > you can understand my fear? :) > > God Bless, > Gavin Howard > On Aug 7, 2013 1:42 AM, "Thomas Dinges"<[email protected]> wrote: > >> Hi Gavin, >> merging often is ok, but merging 4x in only 36 hours? >> >> That's a bit overkill imho. :) >> >> Am 07.08.2013 07:54, schrieb Gavin Howard: >>> Revision: 58987 >>> >> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58987 >>> Author: gdh >>> Date: 2013-08-07 05:54:02 +0000 (Wed, 07 Aug 2013) >>> Log Message: >>> ----------- >>> Merged trunk into branch. Includes r58971 to r58984. >>> >> -- >> Thomas Dinges >> Blender Developer, Artist and Musician >> >> www.dingto.org >> >> _______________________________________________ >> Bf-committers mailing list >> [email protected] >> http://lists.blender.org/mailman/listinfo/bf-committers >> > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
