{"thread":{"id":"37795","subject":"Bug Report: Submodule conflict error message","startedAt":"2014-10-24T02:46:51Z","lastAt":"2014-10-24T02:46:51Z","messageCount":1,"participants":["Juan Palacios"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"251005","messageId":"CABY2JrJBgFDP-gKWUR438PiuB+g0g2wrD9Hoa-fkfCUyUaGp6w@mail.gmail.com","threadId":"37795","inReplyTo":null,"subject":"Bug Report: Submodule conflict error message","fromName":"Juan Palacios","fromEmail":"jpalacios@atlassian.com","sentAt":"2014-10-24T02:46:51Z","receivedAt":"2014-10-24T02:46:51Z","isPatch":false,"sender":{"key":"jpalacios@atlassian.com","avatar":null},"body":"In a project with a submodule, if you merge two diverging branches in\nwhich one branch updated which commit the submodule points to, and the\nother branch moves the submodule to a new location, the resulting\nmerge error message does not provide information about what the\nconflict was, or the path to the conflicted directory.\n\nI've attached a short script which sets up a project with a submodule\nand creates both branches. If after running it you cd into\n'top-level-project' and run 'git merge\nbranch_that_points_the_submodule_to_new_commit' the resulting error\nmessage is:\n\nAuto-merging submodule-moved\nAdding as submodule-moved~HEAD instead\nAutomatic merge failed; fix conflicts and then commit the result.\n\nI would have expected an output in line with other merge conflict\nmessages. Something with the format:\n\nCONFLICT (<REASON>): Merge conflict in <PATH_TO_CONFLICT>\n\nWhere <REASON> would be something like (delete/modify) I believe this\nmight be a bug in the implementation.\n\nThank you\n"}]}