Re: newby question about merge.

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 16, 2007, 11:43 UTC
Message-ID: <Pine.LNX.4.64.0705161241560.6410@racer.site>
In-Reply-To: <f2c23k$dm0$1@sea.gmane.org>

Hi,

On Tue, 15 May 2007, Jakub Narebski wrote:

> You can just do "git cat-file -p :2:filename > filename", then "git add 
> filename" (or "git update-index filename") to resolve conflict.

Do we really want to advertise this obscure-looking plumbing? Wouldn't it be better to teach people to use "git show" instead?

I mean, people can get intimidated by that...

Ciao, Dscho

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