Re: Merging after directory got turned into submodule

On Tue, Aug 11, 2015 at 03:02:41PM +0200, Martin von Gagern wrote: > I've noticed that if I turn a subdirectory into a submodule, I'm having > severe trouble merging branches from before that change, even if they > don't modify that subdirectory at all. > > I've posted this problem on Stack Overfl

Merging after directory got turned into submodule

Hi! I've noticed that if I turn a subdirectory into a submodule, I'm having severe trouble merging branches from before that change, even if they don't modify that subdirectory at all. I've posted this problem on Stack Overflow and started a bounty for it. See http://stackoverflow.com/q/31821219/