Re: Merging submodules
- From
H.Merijn Brand <h.m.brand@xs4all.nl>
- Date
- Jul 31, 2008, 20:44 UTC
- Message-ID
- <20080731224418.42849974@pc09.procura.nl>
- In-Reply-To
- <8aa486160807311203o3fb4deb8u4a5ae57818c76fab@mail.gmail.com>
On Thu, 31 Jul 2008 21:03:26 +0200, "Santi Béjar" <sbejar@gmail.com> wrote:
Show 12 quoted lines
> On Thu, Jul 31, 2008 at 20:15, H.Merijn Brand <h.m.brand@xs4all.nl> wrote: > > On Thu, 31 Jul 2008 17:24:40 +0200, "Santi Béjar" <sbejar@gmail.com> > > wrote: > > > >> I see all OK. Can you provide a self consistent simple testcase that > >> shows what is wrong? > > > > Yes. was rather easy. > > http://www.xs4all.nl/~hmbrand/testcase.tgz > > > > It is because you cannot merge a branch with an empty branch.
Super. So I start with a .gitignore and continue this process. It worked!
> So, or you create an initial commit in the "superproject" or you > create a commit just moving the files of the first module as in: > > http://article.gmane.org/gmane.comp.version-control.git/79887
Thanks again!
-- H.Merijn Brand Amsterdam Perl Mongers http://amsterdam.pm.org/ using & porting perl 5.6.2, 5.8.x, 5.10.x, 5.11.x on HP-UX 10.20, 11.00, 11.11, 11.23, and 11.31, SuSE 10.1, 10.2, and 10.3, AIX 5.2, and Cygwin. http://mirrors.develooper.com/hpux/ http://www.test-smoke.org/ http://qa.perl.org http://www.goldmark.org/jeff/stupid-disclaimers/