Phpstorm Integrated Open source China (oschina.net) Git project, when submitting SVN considerations

First Step: Configure Git.exe

File, Default Settings, Version Control, git, Path go git executable: D:\Program files\git\bin\git . exe

Step Two: Clone project

VCS - Checkout from Version Control , Git , Clone Repository , fill in the project's GI T information, such as

Git Repository URL: https://git.oschina.net/xxx/php-note.git
Parent Directory: d:\PHP\xampp2\htdocs\
Directory Name: php-note

Note : If the directory already exists, such as d:\PHP\xampp2\htdocs\php-note, it needs to be deleted or renamed.

Step three: Let the project integrate VCS

VCS-Enalbe version control integration Select a version control system to associate with the project root, choose C3>git

note that when the pull file is to the Oschina server, the box alert " does the line break automatically change?" "Here, choose not to convert, i.e."Commitas is ", as shown in:

Ubuntu Install git

sudo apt-get install git

"What to consider when submitting SVN "

1, as shown, before submitting SVN, on the right side in addition to tick the first check box, the others do not tick, otherwise there will be a variety of formatting code, such as tampering with the code, such as

Tick "Cleanup", code

onclick= "Leave_del (' <!--{$val [' Leaveid ']}--> ')"

will be changed to

onclick= "Leave_del (' <!--{$val [' Leaveid; ']} --';) '

This is not the result I want!

2, in addition, when configuring SVN, File, Default Settings, Version Control, SVN, remove the checkmark "Enable interactive mode "

3. How to resolve conflicts?

Right-click Conflict files, Subversion --- Resolve Text Conflict...

Phpstorm Integrated Open source China (oschina.net) Git project, when submitting SVN considerations