Re: Strange branch merging.
On Feb 12, 2009, at 11:52 AM, Adam Panayis wrote:
Show 6 quoted lines
> 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