From: Jakub Narebski <jnareb@gmail.com>
To: "Nguyen Thai Ngoc Duy" <pclouds@gmail.com>
Cc: "git mailing list" <git@vger.kernel.org>
Subject: Re: on subtree checkout
Date: Sun, 24 Feb 2008 16:45:47 +0100 [thread overview]
Message-ID: <200802241645.49718.jnareb@gmail.com> (raw)
In-Reply-To: <fcaeb9bf0802240712u5bc7173du1fe67c3bcd89d1a4@mail.gmail.com>
Nguyen Thai Ngoc Duy wrote:
> 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
next prev parent reply other threads:[~2008-02-24 15:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-24 9:34 on subtree checkout Nguyen Thai Ngoc Duy
2008-02-24 9:59 ` Robin Rosenberg
2008-02-24 10:23 ` Jakub Narebski
2008-02-24 10:53 ` Robin Rosenberg
2008-02-24 11:53 ` Jakub Narebski
2008-02-24 10:03 ` Jakub Narebski
2008-02-24 15:12 ` Nguyen Thai Ngoc Duy
2008-02-24 15:45 ` Jakub Narebski [this message]
2008-02-24 15:59 ` Matthieu Moy
2008-02-24 17:22 ` Robin Rosenberg
2008-02-26 1:59 ` Johannes Schindelin
2008-02-26 2:30 ` David Symonds
2008-02-26 11:23 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200802241645.49718.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).