From: Mark Burton <markb@ordern.com>
Date: Thu, 06 Nov 2008 17:53:05 GMT
Subject: Re: Issue updating files during a checkout from a remote push
Message-ID: <loom.20081106T174246-381@post.gmane.org>
In-Reply-To: <09C2A669-2B99-4490-9C95-FCCD76C03D61@idibu.com>


Hi Steve,

I think you are making the same mistake as I did when I first started using git.

You can't push to "master" from a remote repository because if you do, the index
and working files associated with the receiving repository look as if they have
been changed because they are out of date WRT the repository.

If you want to push to a repository that has working files associated with it,
push to a remote branch in that repository and then merge the contents of the
remote branch into the working files. I.e. don't push to "master", push to
"remotes/somename/master" and then merge somename/master into the master branch.

That's what I do now to migrate changes from my satellite development machines
to my master machine.

Cheers,

Mark