Re: cherry picking and merge

On Fri, Aug 1, 2014 at 5:13 PM, Mike Stump [off-list ref] wrote:

On Aug 1, 2014, at 12:22 PM, Nico Williams [off-list ref] wrote:

quoted

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.