Thread (18 messages) flat view 18 messages, 4 authors, 2016-06-15

Re: Merging submodules

From: Santi Béjar <hidden>
Date: 2016-06-15 22:45:05

On Thu, Jul 31, 2008 at 20:15, H.Merijn Brand [off-list ref] wrote:
On Thu, 31 Jul 2008 17:24:40 +0200, "Santi Béjar" [off-list ref]
wrote:
quoted
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. 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

Santi
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help