Den 2013-03-06 19:12:05 skrev Heiko Voigt :
On Mon, Feb 25, 2013 at 05:44:05PM +0100, Daniel Bratell wrote:
I can phrase this in two ways and I'll start with the short way:
Why does a merge of a git submodule use as merge-base the commit that
was
active in the merge-base of the parent
I can phrase this in two ways and I'll start with the short way:
Why does a merge of a git submodule use as merge-base the commit that was
active in the merge-base of the parent repo, rather than the merge-base of
the two commits that are being merged?
The long question is:
A submodule cha
2 matches
Mail list logo