Nguyen Thai Ngoc Duy wrote: > On Sun, Feb 24, 2008 at 5:03 PM, Jakub Narebski <jnareb@xxxxxxxxx> wrote: >> >> "Nguyen Thai Ngoc Duy" <pclouds@xxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
