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

Re: commiting while the current version is in conflict

From
Richard Hartmann <richih.mailinglist@gmail.com>
Date
Oct 17, 2008, 09:35 UTC
Message-ID
<2d460de70810170235q1c9211c3r1f56067e694b1ac@mail.gmail.com>
In-Reply-To
<m3d4hzk2du.fsf@localhost.localdomain>
On Fri, Oct 17, 2008 at 11:16, Jakub Narebski <jnareb@gmail.com> wrote:
Show 5 quoted lines
> From time to time somebody proposes to add a command which is used
> only to say that given conflict got resolved, i.e. yet another
> porcelain "around" git-update-index plumbing (in addition to git-add,
> git-mv and git-rm).  One of problems is how to call it: git-resolve,
> git-resolved, git-mark-resolved?

In that case, you would still need a pre-add hook. The problem is not that people can't mark resolved without adding. It's that they can't add without checking (automatically) if there are no conflicts.

Richard
Previous: Jakub NarebskiNext: Junio C Hamano
Message 6 of 7 in “Re: commiting while the current version is in conflict”
  1. Junio HamanoOct 16, 2008
  2. Richard HartmannOct 17, 2008
  3. Junio C HamanoOct 17, 2008
  4. Richard HartmannOct 17, 2008
  5. Jakub NarebskiOct 17, 2008
  6. Richard HartmannOct 17, 2008
  7. Junio C HamanoOct 17, 2008

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.