From: Lars Hjemli <lh@elementstorage.no>
Date: Tue, 09 Dec 2008 10:57:33 GMT
Subject: Re: Forcing --no-ff on pull
Message-ID: <8c5c35580812090257w46dc3b75mc8f300ab396c82bd@mail.gmail.com>
In-Reply-To: <1228819557.18611.80.camel@starfruit.local>

On Tue, Dec 9, 2008 at 11:45, R. Tyler Ballance <tyler@slide.com> wrote:
> Really hate to take this much bandwidth up on the mailing list over such
> a silly problem, but after spending a week trying to /talk/ and educate
> some folks, I feel drastic measures need to be taken ;)

A possible solution could be the "Integration manager workflow" described here:

  http://whygitisbetterthanx.com/#any-workflow

But it has the potential of confusing your co-devs ;-)

--
larsh