From: Daniel Barkalow <barkalow@iabervon.org>
Date: Thu, 06 Aug 2009 17:41:58 GMT
Subject: Re: Merging to and from non-current branches.
Message-ID: <alpine.LNX.2.00.0908061320030.2147@iabervon.org>
In-Reply-To: <C766A4F9-C12B-4F94-8B24-9BD3665B70E8@mgreg.com>

On Wed, 5 Aug 2009, lists@mgreg.com wrote:

> 
> On Aug 5, 2009, at 5:28 PM, Alex Riesen wrote:
> 
> >On Wed, Aug 5, 2009 at 04:48, lists@mgreg.com<lists@mgreg.com> wrote:
> > >I appreciate your post.  I understand what you're saying, and I'm not so
> > >much concerned about the logistics of what need to occur so much as a
> > >single
> > >command to intuitively handle it.  I've been doing a great deal of
> > >incremental development lately and it becomes rather tedious to have to
> > >checkout master, merge dev, re-checkout dev and proceed.  I'm not sure why
> > >this isn't currently possible with a single command.
> >
> >Because no one needed this sequence of commands for long enough.
> 
> As I said, I understand what is being said, but in IMHO it would seem that a
> merge of that nature would be immediately desirable.  Think of it more as a
> local "push".

You mean like "git push . dev:master"? That does work in the case where a 
content merge is not required (although not otherwise).

	-Daniel
*This .sig left intentionally blank*