| Issue 3354: | submodule move to below its old location makes non-mergeable commit | |
| 1 person starred this issue and may be notified of changes. | Back to list |
I just built a commit in which a submodule was renamed to be located below its original location (ie a/ -> a/foo). git mv required two steps (git mv a foo; mkdir a; git mv foo a/foo), but accepted the change. The commit with git (also on other checkouts), but gerrit claims it 'Cannot Merge' the change, and I see no other reason for it to refuse to merge it (cherry-pick strategy, in case this makes a difference). See http://review.coreboot.org/#/c/10106/
May 6, 2015
#1
pgeo...@google.com
|
|
| ► Sign in to add a comment |