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

Re: How to pre-empt git pull merge error?

From
Antoine Pelisse <apelisse@gmail.com>
Date
Nov 27, 2013, 16:38 UTC
Message-ID
<CALWbr2wNODeLSmQ5ztQmKVxBSguNJ1bbSbvY66sdsP09dSUUgA@mail.gmail.com>
In-Reply-To
<vpq8uw9q1r4.fsf@anie.imag.fr>
Show 17 quoted lines
>> On Wed, 27 Nov 2013 15:17:27 +0000
>> Pete Forman <petef4+usenet@gmail.com> wrote:
>>
>>> I am looking for a way of detecting up front whether a git pull or git
>>> merge would fail. The sort of script I want to perform is to update a
>>> server.
>>>
>>>     git fetch
>>>     git okay
>>>     stop server
>>>     backup data
>>>     git merge
>>>     start server
>>>
> I don't know a simple way to do the pre-merge check without actually
> doing the merge (other than patching git merge to add a --dry-run
> option)

Wouldn't that be a nice use-case for git-recursive-merge --index-only ($gmane/236753) ?

Previous: Matthieu MoyNext: Thomas Rast
Message 4 of 7 in “How to pre-empt git pull merge error?”
  1. Pete FormanNov 27, 2013
  2. Konstantin KhomoutovNov 27, 2013
  3. Matthieu MoyNov 27, 2013
  4. Antoine PelisseNov 27, 2013
  5. Thomas RastNov 27, 2013
  6. Pete FormanNov 28, 2013
  7. Junio C HamanoNov 27, 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.