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

Re: How to handle patch series conflicts

From
SSStephen Smith <ischis2@cox.net>
Date
Oct 9, 2018, 13:11 UTC
Message-ID
<3649573.ScJ4RYJQ9R@thunderbird>
In-Reply-To
<2206767.tHxkKBSiVS@thunderbird>
On Monday, October 8, 2018 10:51:09 PM MST Junio C Hamano wrote:
Show 5 quoted lines
> The scripts themselves having the same name that is no more specific
> tha just "commit" does not bother _me_ personally too much.  If I
> were doing it, unless you are an obsessive type that wants to see
> spanking cleanness everywhere, I'd limit the changes to the minimum.
> 
No I'm not an obsessive type.
sps
Previous: Junio C HamanoNext: Stephen & Linda Smith
Message 18 of 21 in “test files with same names?”
  1. Duy NguyenSep 3, 2018
  2. Junio C HamanoSep 4, 2018
  3. 0/5 Commit test name clean-upStephen P. Smith, Oct 23, 2018
  4. 2/5 t7509: cleanup description and filenameStephen P. Smith, Oct 23, 2018
  5. Eric SunshineOct 23, 2018
  6. 1/5 t2000: rename and combine checkout clash testsStephen P. Smith, Oct 23, 2018
  7. 4/5 t7500: rename commit tests script to comply with naming conventionStephen P. Smith, Oct 23, 2018
  8. Eric SunshineOct 23, 2018
  9. 3/5 t7502: rename commit test script to comply with naming conventionStephen P. Smith, Oct 23, 2018
  10. 5/5 t7501: rename commit test to comply with naming conventionStephen P. Smith, Oct 23, 2018
  11. Eric SunshineOct 23, 2018
  12. Stephen & Linda SmithSep 4, 2018
  13. How to handle patch series conflictsStephen & Linda Smith, Sep 5, 2018
  14. Stefan BellerSep 5, 2018
  15. Junio C HamanoSep 5, 2018
  16. Stephen & Linda SmithOct 8, 2018
  17. Junio C HamanoOct 9, 2018
  18. Stephen SmithOct 9, 2018
  19. Stephen & Linda SmithSep 5, 2018
  20. Stephen & Linda SmithSep 5, 2018
  21. Stephen SmithSep 7, 2018

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.