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

Re: how do I resolve this merge manually + mergetool bug

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Feb 24, 2009, 08:32 UTC
Message-ID
<81bfc67a0902240032t783abcabgaf8fa13b2a43e48@mail.gmail.com>
In-Reply-To
<20090224074727.GA23927@hashpling.org>
On Tue, Feb 24, 2009 at 2:47 AM, Charles Bailey <charles@hashpling.org> wrote:
> I'll look at adding
> a test case to mergetool and see how easy it is to get it to handle
> this case better.

few weeks back I created a patch for mergetool, it was rejected ultimately on the basis that it had to cleanup temporary files and in reality this was a problem with a lot of mergetool, the suggestion was made that mergetool needs refactoring. I believe this problem is a similar symptom. basically mergetool should touch my files before I tell it what to do. if it has to move and back up my files before deciding then at the very least it should copy them back into place if I delete the remote. preferably in this case though it would just delete the remote or backup my local files and copy the remote in after I told it what to do (or maybe even delete my local files).

-- 
Caleb Cushing

http://xenoterracide.blogspot.com
Previous: Charles BaileyNext: Charles Bailey
Message 7 of 8 in “how do I resolve this merge manually + mergetool bug”
  1. Caleb CushingFeb 24, 2009
  2. Junio C HamanoFeb 24, 2009
  3. Caleb CushingFeb 24, 2009
  4. Junio C HamanoFeb 24, 2009
  5. Caleb CushingFeb 24, 2009
  6. Charles BaileyFeb 24, 2009
  7. Caleb CushingFeb 24, 2009
  8. Charles BaileyFeb 24, 2009

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.