Testing for a merge conflict without a working copy

From: Joshua Jensen <jjensen@workspacewhiz.com>
Date: Sep 21, 2010, 14:45 UTC
Message-ID: <4C98C4FC.1080904@workspacewhiz.com>

  If I simply want to determine whether a merge would conflict, is there 
a way to do it without a working copy?

Thanks!

Josh

$ 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.