Re: newby question about merge.

picca [off-list ref] 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.

On Tue, 15 May 2007 14:47:51 -0700
Junio C Hamano [off-list ref] wrote:

picca [off-list ref] writes:

quoted

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