Re: [git-users] Re: Sync-ing repositories

2009-12-05 Thread Roddie Grant
On 4/12/09 15:33, Konstantin Khomoutov khomou...@gmail.com wrote: On Dec 1, 2:34 pm, Roddie Grant rod...@myword.co.uk wrote: [...] In two minutes I ended up with two blatantly different repositories, with both the push and the merge saying Up to date, even though the server still had

[git-users] Re: Sync-ing repositories

2009-12-04 Thread Konstantin Khomoutov
On Dec 1, 2:34 pm, Roddie Grant rod...@myword.co.uk wrote: I develop a website on my laptop, in a Git repository. On the staging server (for testing) there is another repository. From time to time I push from the development repository to the server repository, and then git merge dev/master