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

Re: newby question about merge.

From
Junio C Hamano <junkio@cox.net>
Date
May 15, 2007, 21:47 UTC
Message-ID
<7vabw5iws8.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20070515133720.20d76042@localhost.localdomain>
picca <picca@synchrotron-soleil.Fr> writes:
> Is it possible to add this git cat-file -p :2:filename > filename in
> the man page of git-merge in the resolve conflict part ?
>
> Or a link to the documentation speaking of this stage part.
See:
http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#conflict-resolution

As this walk through section from the user manual's already talks about it, I am not sure if we would want to duplicate its wording in git-merge manual page.

Regardlessly, I think it is a good idea to refer to it in SEE ALSO section, just in case the user hasn't read the user manual before reading the git-merge manpage.

Previous: piccaNext: picca
Message 5 of 11 in “newby question about merge.”
  1. piccaMay 15, 2007
  2. Alex RiesenMay 15, 2007
  3. Jakub NarebskiMay 15, 2007
  4. piccaMay 15, 2007
  5. Junio C HamanoMay 15, 2007
  6. piccaMay 16, 2007
  7. Johannes SchindelinMay 16, 2007
  8. Christian MICHONMay 16, 2007
  9. Johannes SchindelinMay 16, 2007
  10. Christian MICHONMay 16, 2007
  11. Johannes SchindelinMay 16, 2007

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.