From: Konstantin Khomoutov <flatworm@users.sourceforge.net>
Date: Fri, 06 Sep 2013 10:06:33 GMT
Subject: Re: Problem setting up a shared git repository
Message-ID: <20130906140633.8b113079bf45e8a5307a1d11@domain007.com>
In-Reply-To: <1378417432.91149.YahooMailNeo@web161803.mail.bf1.yahoo.com>

On Thu, 5 Sep 2013 14:43:52 -0700 (PDT)
Eyal Zinder <ezinder@yahoo.com> wrote:

[...]
> The problem I faced later on was in parallel development, when
> changes were made to a file in one repository, and at the same time
> other changes made to the same file in another repository..  I
> couldh't push changes from the dev\foo to prod\foo or to origin..
[...]

Did Git tell you the push failed because of "non-fast-forward update"?