Re: [BUG?] Issue with merging from another branch after replacing subdirectory with submodule

Hi Stefan, Thanks for the reply. Is there any known workaround for this situation, so that a manual resolve isn't needed for every single merge in this scenario? Thanks, Benbuck On Thu, Apr 6, 2017 at 4:05 PM, Stefan Beller wrote: > On Wed, Apr 5, 2017 at 11:10 PM, Ben Nason wrot

[BUG?] Issue with merging from another branch after replacing subdirectory with submodule

Hi, In git if you replace a subdirectory with a submodule in one branch, every successive merge from another branch without that change will cause a conflict. To reproduce this please see below (DOS batch file). Is this expected behavior? Thanks, Benbuck :: prep simple repo with subdir git init