From: Nils Adermann <naderman@naderman.de>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: subtree merge tries to merge into wrong directory
Date: Sat, 02 Jan 2010 19:17:14 +0100 [thread overview]
Message-ID: <4B3F8DAA.8090908@naderman.de> (raw)
In-Reply-To: <c10155f8a7a2dd451f0b74e323f3a989.squirrel@www.naderman.de>
naderman@naderman.de schrieb:
> So I finally got around to trying this. This was my first result:
>
> $ git merge -Xsubtree=lib/ezc/trunk/Reflection/ FETCH_HEAD
> fatal: entry not found in tree 60270661e0d2a5ee03b24609fac5c6d00d048988
>
Turns out that only happens because of the trailing slash.
lib/ezc/trunk/Reflection works reliably.
Nils
prev parent reply other threads:[~2010-01-02 18:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-10 3:41 subtree merge tries to merge into wrong directory Nils Adermann
2009-12-10 4:20 ` David Aguilar
2009-12-10 4:26 ` Nils Adermann
2009-12-10 14:38 ` Avery Pennarun
2009-12-16 18:05 ` naderman
2010-01-02 18:17 ` Nils Adermann [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=4B3F8DAA.8090908@naderman.de \
--to=naderman@naderman.de \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.