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

Re: nd/setup

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 4, 2010, 21:42 UTC
Message-ID
<7vfx3a7v3b.fsf@alter.siamese.dyndns.org>
In-Reply-To
<j2mfcaeb9bf1004041141p28fba95dz5cb11918c172d32f@mail.gmail.com>
Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:
> I wanted to update nd/setup topic, but found nd/root-git was merged in
> between its two parts, which resulted in non-trivial conflicts in the
> end.

I am not quite sure what you want me to do. Replacing these named commits in place (meaning, the merge with nd/root-git to adjust the later parts that depend on that fix is reproduced while rebuilding the topic) has some silly conflicts, and rebuilding the whole series without the merge but with the named commits replaced has different conflicts.

As the fix of nd/root-git is already in 'master', it might make more sense to apply the whole series rebased to the newer codebase instead of keeping the same fork point as the older series. That also removes the worries for you about having to send conflict resolutions, no?

Previous: Nguyen Thai Ngoc DuyNext: Sverre Rabbelier
Message 6 of 8 in “What's cooking in git.git (Apr 2010, #01; Fri, 02)”
  1. Junio C HamanoApr 2, 2010
  2. Nguyen Thai Ngoc DuyApr 2, 2010
  3. nd/setupJonathan Nieder, Apr 3, 2010
  4. Nguyen Thai Ngoc DuyApr 3, 2010
  5. Nguyen Thai Ngoc DuyApr 4, 2010
  6. Junio C HamanoApr 4, 2010
  7. Sverre RabbelierApr 2, 2010
  8. Nicolas PitreApr 3, 2010

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.