Re: Strange branch merging.

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

 



Pieter de Bie wrote:
Hey,

[ Please don't top-post here, it makes following the discussion harder ]

On Feb 12, 2009, at 12:40 PM, Adam Panayis wrote:
When I try to do that on box B I get the master branch from box A but I get the changes made to branch blah on box A.

I do not understand why, on box B, the master branch is showing changes made to the blah branch on box A. (Yet on box A the changes to the blah branch are not shown in the master)

You probably pulled in the 'blah' branch rather than the 'master' branch because that was the branch that is checked out on box A. You can verify this by looking at 'git log' and see that the commit on the blah branch is also there. To pull the master branch, specify
it explicitly, like this:

    git pull boxA:path/to/repo master

- Pieter
Pieter, thank you very much. Looks like that is indeed the mistake I was making.
--
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]

  Powered by Linux