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

[StGit PATCH 0/6] Use git conflict handling on push

From
David Kågedal <davidk@lysator.liu.se>
Date
Aug 20, 2007, 08:11 UTC
Message-ID
<11875975232619-git-send-email-davidk@lysator.liu.se>

This series of patches updates "stg push" to leave conflicts in the index, in the normal git fashion.

This means that conflict handling and resolution are handled by git and not stg, which should make it possible to simplify stg quite a bit. For instance, the 'conflicts' file should go away.

Unfortunately, this patch series isn't complete, since it doesn't remove all uses of the stg merge code. The remaining client of that code is the "sync" command, which I have never used, and haven't studied very much. But if that command is changed somehow, then most of the code in gitmergeonefile.py will go simply away. And the 'conflicts' file will not be used.

See also previous discussions:

https://gna.org/task/?5140 http://thread.gmane.org/gmane.comp.version-control.git/48271

-- 
David KÃ¥gedal
Next: David Kågedal
Message 1 of 18 in “Use git conflict handling on push”
  1. 0/6 Use git conflict handling on pushDavid Kågedal, Aug 20, 2007
  2. 1/6 Split git.merge into two functionsDavid Kågedal, Aug 20, 2007
  3. 2/6 Don't try to merge files that merge-recursive already mergedDavid Kågedal, Aug 20, 2007
  4. 3/6 Don't touch state after conflict in pushDavid Kågedal, Aug 20, 2007
  5. 4/6 Added a test case to check what happens when push finds a conflictDavid Kågedal, Aug 20, 2007
  6. 5/6 Simplify merge_recursiveDavid Kågedal, Aug 20, 2007
  7. 6/6 Use the output from merge-recursive to list conflictsDavid Kågedal, Aug 20, 2007
  8. Karl HasselströmAug 22, 2007
  9. David KågedalAug 22, 2007
  10. Karl HasselströmAug 22, 2007
  11. Karl HasselströmAug 22, 2007
  12. Leave working dir and index alone after failed (conflicting) pushKarl Hasselström, Aug 22, 2007
  13. David KågedalAug 20, 2007
  14. Junio C HamanoAug 20, 2007
  15. Uwe Kleine-KönigAug 21, 2007
  16. Junio C HamanoAug 22, 2007
  17. Karl HasselströmAug 22, 2007
  18. Catalin MarinasAug 23, 2007

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.