From: Santi Béjar <sbejar@gmail.com>
Date: Fri, 18 Apr 2008 10:02:58 GMT
Subject: Re: Q. regarding subtree merge
Message-ID: <8aa486160804180302m43a7c942la93954401741b264@mail.gmail.com>
In-Reply-To: <loom.20080418T091729-407@post.gmane.org>

On Fri, Apr 18, 2008 at 11:36 AM, Stefan Näwe
<stefan.naewe+git@gmail.com> wrote:
> Hi all.
>
>  I tried the scenario described in
>  $GIT_DIR/Documentation/howto/using-merge-subtree.txt and have some problems
>  with it.
>
>  My setup:
>
>  I use git to track my changes in three different "project directories", lets
>  say:
>
>  ...../src_root/libfoo
>  ...../src_root/appbar
>  ...../bin_root/installed
>
>  All three git repositories contain a topic branch (lets say 'current-work')
>  that I want to track.
>
>  Now I want to setup one git repository containing only the three directories
>  'libfoo', 'appbar', and 'installed' that others can clone easily. Reading the
>  above howto document, I think this should be possible.
>
>  I do:
>
>   $ mkdir super-prj
>   $ cd super-prj
>   $ git init
>   $ git add remote -f libfoo ../path/to/src_root/libfoo
>
>  OK. No problem.
>
>  The problem arises after the second step of the howto:
>
>   $ git merge -s ours --no-commit libfoo/current-work
>
>  Now, all files of 'libfoo' are in the current directory. This is not what I
>  want.
>
>  Could someone please tell me what I'm doing wrong?

You are trying to merge libfoo with an empty project, so the merge
just "fast-forward" to the other commit as you do not have an "ours".

Simply skip the merge step.

Santi