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

Re: on subtree checkout

From
Jakub Narebski <jnareb@gmail.com>
Date
Feb 24, 2008, 15:45 UTC
Message-ID
<200802241645.49718.jnareb@gmail.com>
In-Reply-To
<fcaeb9bf0802240712u5bc7173du1fe67c3bcd89d1a4@mail.gmail.com>
Nguyen Thai Ngoc Duy wrote:
Show 9 quoted lines
> On Sun, Feb 24, 2008 at 5:03 PM, Jakub Narebski <jnareb@gmail.com> wrote:
>>
>> "Nguyen Thai Ngoc Duy" <pclouds@gmail.com> writes:
>>
>>> I'm going to implement subtree checkout. [...]
>>
>>  As far as I can see the problem lies in merging...
> 
> Can you elaborate? I'm really noob at merging.

What to do if when merging, or rebasing, there is conflict _outside_ checked out subtree?

-- 
Jakub Narebski
Poland
Previous: Nguyen Thai Ngoc DuyNext: Matthieu Moy
Message 8 of 13 in “on subtree checkout”
  1. Nguyen Thai Ngoc DuyFeb 24, 2008
  2. Robin RosenbergFeb 24, 2008
  3. Jakub NarebskiFeb 24, 2008
  4. Robin RosenbergFeb 24, 2008
  5. Jakub NarebskiFeb 24, 2008
  6. Jakub NarebskiFeb 24, 2008
  7. Nguyen Thai Ngoc DuyFeb 24, 2008
  8. Jakub NarebskiFeb 24, 2008
  9. Matthieu MoyFeb 24, 2008
  10. Robin RosenbergFeb 24, 2008
  11. Johannes SchindelinFeb 26, 2008
  12. David SymondsFeb 26, 2008
  13. Johannes SchindelinFeb 26, 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.