From: lists@mgreg.com Date: Wed, 05 Aug 2009 02:48:41 GMT Subject: Re: Merging to and from non-current branches. Message-ID: <518952FC-626C-43FB-BD53-98DE849C9751@mgreg.com> In-Reply-To: On Aug 4, 2009, at 10:45 PM, Daniel Barkalow wrote: > On Tue, 4 Aug 2009, lists@mgreg.com wrote: > >> Hi All, >> >> I've been reading up on some of the GIT commands and I'm not sure >> if what I >> want/need exists. Basically I want to merge all changes from one >> branch to >> another, regardless of whether I'm in either of those branches. At >> the very >> least I would like to merge an existing "development" branch with >> the "master" >> branch without needing to first check out master. I've seen >> rebase, but I'm >> not absolutely sure what that's doing. Thoughts? > > It can't work, because you need to be able to use the working tree to > resolve any conflicts that arise during the merge. Merging without > checking out a branch is a bit like building without checking out a > branch; it would be avoiding using the filesystem for what it's > there for. > > -Daniel > *This .sig left intentionally blank* > Hi Daniel, 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. I suppose I could write a shell script to do so, but that's a little less "native" than I'd like. Best, Michael