Re: Merging to and from non-current branches.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, 4 Aug 2009, lists@xxxxxxxxx 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*
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]