On Fri, Apr 18, 2008 at 2:18 PM, Stefan Näwe <stefan.naewe@xxxxxxxxxxxxxx> wrote: > 2008/4/18, Santi Béjar <sbejar@xxxxxxxxx>: > [...] > > > > $ git reset --soft libfoo/current-work > > > > OK. Thanks. It worked without the merge. > I did another test where the 'super-prj' was not empty, this time with > 'git merge -s...' and > that worked as well. So: > If you have an empty super-prj -> drop the merge + git reset --soft commit If not the next "git merge -s subtree" will fail. > If you have a non-empty super-prj -> do the merge > > But I really don't understand (yet...) why it is as it is... Because you cannot merge an empty branch with another branch. Maybe "git merge -s ours" should fail in this case, because it does not make sense to merge an empty branch with the "ours" strategy. Santi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
