Using GIT and SVN on the same project
Hi!
I prefer GIT, but my company uses SVN. What would be the best way to have both VCS in PHPStorm?
To use GIT for unfinished code and commit to SVN only when there is something working to show?
请先登录再写评论。
In PhpStorm, you can set different VCSs for different directories, but not for the same directory.
So, I am afraid PhpStorm cannot handle your scenario.
Our advice would be to use Git within PhpStorm, and then use some other SVN client to commit changes to Subversion. Make sure you don't commit the .git folder. :)
how do I FORCE PhpStorm to actually use SVN? I've tried removing the entire .git folder but STILL PhpStorm insists on trying to use GIT instead of SVN
Can you please share more details? What kind of actions are you performing?
the only thing I have been able to do to MAKE PHPStorm use SVN instead of git is remove the project entirely from the “Manage Projects” list, remove the entire .idea folder, and then remove everything that begins with .git from the project files and THEN add the project in as a “brand new” project…
if I leave out one of those steps – like, say, not removing the .idea folder – it doesn't work and PHPStorm opens the “new” project still insisting I must use git and not SVN
this, despite the fact there is a .svn folder present in the project files – and possibly NO .git folder
it's like PHPStorm will always want to – except under a very specific set of circumstances – DEFAULT to using git instead of SVN… and I cannot find any way to tell it “DO NOT USE GIT for this project” (like a convenient radio button or a dropdown to select one and only one type of VCS) in any Settings anywhere?
I even tried to remove the path to the git binary in the settings (which you cannot do) and then tried to change it to some invalid path so it literally cannot find any binary – and still it insists on trying to use git, no matter what
Have you tried previous suggestions? Switching mapping from git to SVN in Settings | Version Control | Directory Mappings?