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

Re: `git stash pop` UX Problem

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Feb 28, 2014, 15:42 UTC
Message-ID
<vpq38j3z1jj.fsf@anie.imag.fr>
In-Reply-To
<851tynz2yg.fsf@stephe-leake.org>
Stephen Leake <stephen_leake@stephe-leake.org> writes:
> So it appears that adding a file _does_ tell git that the conflict is
> resolved.

Yes it does. Git _knows_ that you consider the conflict to be resolved. It cannot know how happy you are with the result.

Similarly, in a conflicted merge, the last "git add" does not trigger a commit silently. And a silent commit would be much less serious than a silent data drop.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Stephen LeakeNext: Stephen Leake
Message 28 of 46 in “`git stash pop` UX Problem”
  1. Omar OthmanFeb 24, 2014
  2. Brandon McCaigFeb 24, 2014
  3. Matthieu MoyFeb 24, 2014
  4. Holger HellmuthFeb 25, 2014
  5. Matthieu MoyFeb 25, 2014
  6. Omar OthmanFeb 25, 2014
  7. Junio C HamanoFeb 25, 2014
  8. Stephen LeakeFeb 25, 2014
  9. Junio C HamanoFeb 25, 2014
  10. Stephen LeakeFeb 27, 2014
  11. Omar OthmanFeb 26, 2014
  12. Theodore Ts'oFeb 26, 2014
  13. brian m. carlsonFeb 25, 2014
  14. Omar OthmanFeb 26, 2014
  15. Simon RuderichFeb 26, 2014
  16. Stephen LeakeFeb 27, 2014
  17. Omar OthmanFeb 25, 2014
  18. Matthieu MoyFeb 25, 2014
  19. Omar OthmanFeb 25, 2014
  20. Matthieu MoyFeb 25, 2014
  21. Stephen LeakeFeb 25, 2014
  22. Junio C HamanoFeb 25, 2014
  23. Stefan HallerFeb 26, 2014
  24. Matthieu MoyFeb 26, 2014
  25. Stephen LeakeFeb 28, 2014
  26. Brandon McCaigFeb 28, 2014
  27. Stephen LeakeFeb 28, 2014
  28. Matthieu MoyFeb 28, 2014
  29. Stephen LeakeFeb 28, 2014
  30. Matthieu MoyFeb 28, 2014
  31. Stephen LeakeMar 1, 2014
  32. David KastrupFeb 28, 2014
  33. Stephen LeakeFeb 28, 2014
  34. Matthieu MoyFeb 28, 2014
  35. Junio C HamanoFeb 28, 2014
  36. Stephen LeakeMar 1, 2014
  37. Omar OthmanFeb 26, 2014
  38. Matthieu MoyFeb 26, 2014
  39. Junio C HamanoFeb 26, 2014
  40. Matthieu MoyFeb 26, 2014
  41. Junio C HamanoFeb 26, 2014
  42. David KastrupFeb 26, 2014
  43. Junio C HamanoFeb 26, 2014
  44. David KastrupFeb 27, 2014
  45. Stephen LeakeFeb 28, 2014
  46. Stephen LeakeFeb 27, 2014

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.