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

Re: Testing for a merge conflict without a working copy

From
EWEnrico Weigelt <weigelt@metux.de>
Date
Sep 21, 2010, 15:02 UTC
Message-ID
<20100921150217.GB14711@nibiru.local>
In-Reply-To
<4C98C4FC.1080904@workspacewhiz.com>
* Joshua Jensen <jjensen@workspacewhiz.com> wrote:
>  If I simply want to determine whether a merge would conflict, is there 
> a way to do it without a working copy?
hmm, you could do it in an temporary working copy (see --work-dir).
cu
-- 
----------------------------------------------------------------------
 Enrico Weigelt, metux IT service -- http://www.metux.de/

 phone:  +49 36207 519931  email: weigelt@metux.de
 mobile: +49 151 27565287  icq:   210169427         skype: nekrad666
----------------------------------------------------------------------
 Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------
Previous: Joshua Jensen
Message 2 of 2 in “Testing for a merge conflict without a working copy”
  1. Joshua JensenSep 21, 2010
  2. Enrico WeigeltSep 21, 2010

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.