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

Re: newby question about merge.

From
Ppicca <picca@synchrotron-soleil.fr>
Date
May 16, 2007, 06:33 UTC
Message-ID
<20070516083335.106667c5@localhost.localdomain>
In-Reply-To
<7vabw5iws8.fsf@assigned-by-dhcp.cox.net>

On Tue, 15 May 2007 14:47:51 -0700 Junio C Hamano <junkio@cox.net> wrote:

Show 14 quoted lines
> 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.

I had already red this manual but did not catch up that the :2:configure was the git path of the files I want to retreive. In fact I was missing the git-cat-file part and the git path.

regards, frederic
Previous: Junio C HamanoNext: Johannes Schindelin
Message 6 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.