Re: Strange branch merging.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Pieter de Bie
Date: Thursday, February 12, 2009 - 5:42 am

Hey,

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

On Feb 12, 2009, at 12:40 PM, Adam Panayis wrote:

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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Strange branch merging., Adam Panayis, (Thu Feb 12, 4:52 am)
Re: Strange branch merging., Pieter de Bie, (Thu Feb 12, 5:27 am)
Re: Strange branch merging., Adam Panayis, (Thu Feb 12, 5:40 am)
Re: Strange branch merging., Pieter de Bie, (Thu Feb 12, 5:42 am)
Re: Strange branch merging., Adam Panayis, (Thu Feb 12, 5:59 am)