From: Pieter de Bie <pieter@frim.nl>
Date: Thu, 12 Feb 2009 12:27:58 GMT
Subject: Re: Strange branch merging.
Message-ID: <E65A809A-65AD-4755-8AA7-32AA11C9AB5A@frim.nl>
In-Reply-To: <49940D93.6000204@movency.com>


On Feb 12, 2009, at 11:52 AM, Adam Panayis wrote:

> Once this is done I double check my branches and it shows I still  
> only have the master. Perfect. However, when I check the file I  
> edited on my local machine on the blah branch, the changes are there.
>
> Am I fundamentally misunderstanding the correct usage of git? Is  
> this result expected?

Yes, git pull will never change anything on the remote side. You  
should use 'git push' for that. But, you shouldn't push to repository  
with a working directory unless you know what you're doing -- read http://git.or.cz/gitwiki/GitFaq#non-bare 
  for that.

- Pieter