On Thu, 5 Sep 2013 14:43:52 -0700 (PDT)
Eyal Zinder <ezin...@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"?
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to