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

Re: Stgit and refresh-temp

From
Jon Smirl <jonsmirl@gmail.com>
Date
Nov 24, 2008, 14:11 UTC
Message-ID
<9e4733910811240611x605b539am6a659ab29437035@mail.gmail.com>
In-Reply-To
<20081124111635.GA31986@diana.vm.bytemark.co.uk>

A useful future enhancement would be to adjust patches that insert adjacent areas so that they can pass each other in a pop/pop operation. The most common case of this being appends to end of file.

This would be a form of automatic conflict resolution. The pending patch would be automatically corrected to resolve the adjacent insert conflict. You might want a prompt asking if this was ok andt then remember the answer so that question is not asked repeatedly.

It's a mechanism to say that multiple insertions at point X in the original file don't matter in their order of insertion.

-- 
Jon Smirl
jonsmirl@gmail.com
Previous: Karl HasselströmNext: Karl Hasselström
Message 13 of 14 in “Stgit and refresh-temp”
  1. Jon SmirlNov 4, 2008
  2. Jon SmirlNov 4, 2008
  3. Jon SmirlNov 4, 2008
  4. Karl HasselströmNov 7, 2008
  5. Jon SmirlNov 10, 2008
  6. Jon SmirlNov 10, 2008
  7. Catalin MarinasNov 11, 2008
  8. Karl HasselströmNov 12, 2008
  9. Catalin MarinasNov 12, 2008
  10. Karl HasselströmNov 12, 2008
  11. Catalin MarinasNov 23, 2008
  12. Karl HasselströmNov 24, 2008
  13. Jon SmirlNov 24, 2008
  14. Karl HasselströmNov 12, 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.