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

Re: [PATCH 1/2] checkout --conflict=<style>: recreate merge in a non-default style

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Sep 1, 2008, 07:52 UTC
Message-ID
<48BB9F45.4070509@viscovery.net>
In-Reply-To
<7v4p501j2y.fsf@gitster.siamese.dyndns.org>
Junio C Hamano schrieb:
Show 7 quoted lines
> +--conflict=<style>::
> +	The same as --merge option above, but changes the way the
> +	conflicting hunks are presented, overriding the
> +	merge.conflictstyle configuration variable.  Possible values are
> +	"merge" (default) and "diff3" (in addition to what is shown by
> +	"merge" style, shows the original contents).
> +

If --conflict is basically the same as --merge, couldn't we then pass style argument to --merge or omit it to get the default style?

-- Hannes
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 3 in “checkout --conflict=<style>: recreate merge in a non-default style”
  1. 1/2 checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano, Sep 1, 2008
  2. Johannes SixtSep 1, 2008
  3. Junio C HamanoSep 1, 2008

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.