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

Re: Ensimag students working on textconv for blame

From
Junio C Hamano <gitster@pobox.com>
Date
May 28, 2010, 23:55 UTC
Message-ID
<7v63277f92.fsf@alter.siamese.dyndns.org>
In-Reply-To
<AANLkTinHLoYMgBawxmXpH5XSyJDb_743HEpfCmfqoRHu@mail.gmail.com>
Diane Gasselin <diane.gasselin@ensimag.imag.fr> writes:
> Afterwards, we thought about working on git-merge.
> Actually, when having some local changes in some files
> that would be overwritten by merge, git-merge aborts giving the
> first file for which there is a problem.

That's a nice bite-sized problem to tackle. Thanks (and thank you, Matthieu).

Previous: Diane Gasselin
Message 2 of 2 in “Re: Ensimag students working on textconv for blame”
  1. Diane GasselinMay 28, 2010
  2. Junio C HamanoMay 28, 2010

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.