git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Problem setting up a shared git repository

From
KKKonstantin Khomoutov <flatworm@users.sourceforge.net>
Date
Sep 6, 2013, 10:06 UTC
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"?
Previous: Johannes Sixt
Message 3 of 3 in “Problem setting up a shared git repository”
  1. Eyal ZinderSep 5, 2013
  2. Johannes SixtSep 6, 2013
  3. Konstantin KhomoutovSep 6, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.