[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: Strange branch merging.
From:       Pieter de Bie <pieter () frim ! nl>
Date:       2009-02-12 12:27:58
Message-ID: E65A809A-65AD-4755-8AA7-32AA11C9AB5A () frim ! nl
[Download RAW message or body]


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
--
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


[prev in list] [next in list] [prev in thread] [next in thread]