Re: Strange branch merging.

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

 




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