From: Johannes Sixt <j.sixt@viscovery.net>
To: SungHyun Nam <namsh@posdata.co.kr>
Cc: git@vger.kernel.org
Subject: Re: using merge subtree and move it..
Date: Tue, 09 Sep 2008 08:56:31 +0200 [thread overview]
Message-ID: <48C61E1F.6000907@viscovery.net> (raw)
In-Reply-To: <ga4fho$5ib$1@ger.gmane.org>
SungHyun Nam schrieb:
> I used the subtree merge strategy. And then I moved the directory.
> Now, can I use subtree merge for that new directory?
Sure. It should work just fine.
> $ git pull -s subtree klib master
> remote: Counting objects: 5, done.
> remote: Compressing objects: 100% (2/2), done.
> remote: Total 3 (delta 1), reused 0 (delta 0)
> Unpacking objects: 100% (3/3), done.
> From ssh://192.168.10.10/git/libs/klib
> * branch master -> FETCH_HEAD
> error: Entry 'klib/klib.c' not uptodate. Cannot merge.
Your problem is not related to subtree merge. Make sure you have no
changes to commit before you merge.
> fatal: merging of trees 31dd1721641a25bfb0225138a34c43483d870377 and
> bccba7da98b042817fdbd92c62b706919216b571 failed
> Merge with strategy subtree failed.
-- Hannes
next prev parent reply other threads:[~2008-09-09 6:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-09 0:21 using merge subtree and move it SungHyun Nam
2008-09-09 6:56 ` Johannes Sixt [this message]
2008-09-09 9:59 ` SungHyun Nam
2009-11-03 2:57 ` Milos Jakubicek
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=48C61E1F.6000907@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=namsh@posdata.co.kr \
/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.