 <p>Try to checkout your branch to a different folder than your original work folder, git will not delete the existing folders (from the different folder structure) to this new one - so you would still have folders in Tests\x-test and Tests\y-test.</p> <p>However, <code>git clean -fd</code> could be used to remove untracked directories.</p>