Hi there! I have following problem: I've downloaded Symfony PR10 and created a lokal git repo, including the "vendors" directory. So far so good. But now I have serious troubles upgrading to PR12. What i tried is: 1. added the symfony-standard github-repo as new remote to my local repo 2. created a local tracking branch for PR12 3. updated my vendors (in my PR12 branch) by calling vendors.sh 4. tried to merge PR12 into my master branch. following error occures: since all vendors (in PR12) are pulled via "git clone" and are ignored by PR12 (.gitignore), git says something like: i don't let you switch back to your masterbranch, cause untracked files (vendors) would be overwritten.
So, no checkout of master possible -> no merge possible. I really don't know how to handle this, I guess it would be much easier if symfony-standard would make use of gitmodules. Anyone can explain why symfony-standard does not use gitmodules`? Or can anyone explain how I could merge the PR12 into my local repo? BR Stephan -- If you want to report a vulnerability issue on symfony, please send it to security at symfony-project.com You received this message because you are subscribed to the Google Groups "symfony users" group. To post to this group, send email to symfony-users@googlegroups.com To unsubscribe from this group, send email to symfony-users+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/symfony-users?hl=en
