From: Nico Williams <nico@cryptonector.com>
Date: Fri, 01 Aug 2014 22:19:00 GMT
Subject: Re: cherry picking and merge
Message-ID: <CAK3OfOgJRD1bOjdgHao4U3xZZaVEhr=YdFGdWGR1800K5=wkGw@mail.gmail.com>
In-Reply-To: <615C1C6F-4FE0-4A83-8DE6-837386D88A15@comcast.net>

On Fri, Aug 1, 2014 at 5:13 PM, Mike Stump <mikestump@comcast.net> wrote:
> On Aug 1, 2014, at 12:22 PM, Nico Williams <nico@cryptonector.com> wrote:
>> If you always rebase
>
> I can’t use rebase unless you make rebase work with multiple users and pushing pulling.

That works now, and I do it all the time.  Have a single repo ("the
truth"), always rebase local commits on top of the latest upstream,
always do fast-forward pushes.  Done.