From: "Santi Béjar" <sbejar@gmail.com>
To: "Stefan Näwe" <stefan.naewe@googlemail.com>
Cc: git@vger.kernel.org
Subject: Re: Q. regarding subtree merge
Date: Fri, 18 Apr 2008 14:59:57 +0200 [thread overview]
Message-ID: <8aa486160804180559y70c72449g8f0beff63c229c7b@mail.gmail.com> (raw)
In-Reply-To: <60b759020804180518k2fc1957bk60a5d7cdac8c3991@mail.gmail.com>
On Fri, Apr 18, 2008 at 2:18 PM, Stefan Näwe
<stefan.naewe@googlemail.com> wrote:
> 2008/4/18, Santi Béjar <sbejar@gmail.com>:
>
[...]
> >
> > $ git reset --soft libfoo/current-work
> >
>
> OK. Thanks. It worked without the merge.
> I did another test where the 'super-prj' was not empty, this time with
> 'git merge -s...' and
> that worked as well. So:
> If you have an empty super-prj -> drop the merge
+ git reset --soft commit
If not the next "git merge -s subtree" will fail.
> If you have a non-empty super-prj -> do the merge
>
> But I really don't understand (yet...) why it is as it is...
Because you cannot merge an empty branch with another branch.
Maybe "git merge -s ours" should fail in this case, because it does not
make sense to merge an empty branch with the "ours" strategy.
Santi
prev parent reply other threads:[~2008-04-18 13:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-18 9:36 Q. regarding subtree merge Stefan Näwe
2008-04-18 10:02 ` Santi Béjar
2008-04-18 10:09 ` Santi Béjar
2008-04-18 12:18 ` Stefan Näwe
2008-04-18 12:59 ` Santi Béjar [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8aa486160804180559y70c72449g8f0beff63c229c7b@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
--cc=stefan.naewe@googlemail.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.
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 NNTP newsgroup(s).