Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers. This question does not appear to be about a specific programming problem, a software algorithm, or software tools primarily used by programmers. If you believe the question would be on-topic on another Stack Exchange site, you can leave a comment to explain where the question
Tag: symfony
Git merge directories that have become separated
Not quite sure how to explain this clearly, but here goes. Due to a bug in Tortoise-git, we’ve ended with a situation like this; All our code should be under a directory structure like this (this is Symfony2 project); but, due (we think) to the bug in Tortoise-git, when we pull the code onto a linux box, we’ve got; (i.e.