Version control SVN and git usage explained

Transferred from: http://www.cnblogs.com/iCocos/p/4767692.html?hmsr=toutiao.io&utm_medium=toutiao.io&utm_source= Toutiao.io

If there is any infringement, please write to: oiken@qq.com

The actual development of the company, in the celestial use more or SVN, because SVN is centralized, in the celestial work you understand. -----------------svn-----------------: The most common basic steps--Download (full download, first time), download the server project to the local start to develop SVN checkout ip-uaerbane=?     -password=?   Here need add Jane: Co update warehouse, the server project changes need to be updated to local, so as to avoid errors or conflicts svn updata//Here the direct commit can be Jane: up write code ... View status svn status Jane: St Add to warehouse SVN add name submit Project

SVN commit-m "Comments"

Jane: CI   version fallback: Error action, requirements change, view history svn updata R version number  //view fallback version formal: SVN update svn merge      -r   Version number (present): Version number (front) name svn ci-m Comment   Remove file svn remove name Jane: RM     View version number SVN updata      //First All new data svn log           //Print all versions     II: Conflict resolution--------  out of data- -->updata->commit (manual Conflict Resolution: Postpone): SVN resolved name   Effective conflict avoidance: first updata->, before modifying files or modifying files and greeting colleagues nbsp   Supplement: When seat a new ⼈ person plus ⼊ into (John Doe into ⼊ into the company) 1. What to do and what to do ⺫⽬ Manager to SVN server address/SVN account and password requirements ⽂ documentation: current requirements to ⼝ Port ⽂ document: Connect ⼝ port ⽂ documentation Detailed server all Access ⼝ effect diagram: bounded ⾯ polygon to What kind of ⼦ the bottom of the child

2. Download the server's full code to the local SVN checkout server address ⽤ username and password 3. Code conflicts out of date: Expired DF: ⽰ in command ⾏ line shows all the different ⽅ party e: edit conflict in command ⾏ line: Show ⽰ to resolve conflict Option MC: Make ⽤ use my code to overwrite server code TC: Make ⽤ Use the server code to overwrite my Code p: ⽐ than all version changes, ⼿ manually resolve conflicts->SVN resolved Person.h Note: 1> before modifying public ⽂ files, it is best to first Update, and then modify the 2> before modifying the public ⽂ file, you can talk to colleagues ⼀, do not modify the ⽂ file, after the modification to let colleagues update three: graphical interface (UI): cornerstone/version

Here is a brief introduction to the use of cornerstone and points of attention--main interface--
Practical Cornerstone several places to note: 1. Check the log to find the "Log" option, select and tap.
Check if your current version is up to date, and if it is not the latest version, start with the 2nd step;
If your current version is up-to-date, start with the 3rd step; 2. Update to the latest version before the current programmer opens the project, find the "Update to Latest Revision" option, select and click.
Purpose: Keep the current programmer client's project version up-to-date. 3. Edit Item 4. Before submitting, click "Update to Latest Revision" again to keep the project up to date. 5. After updating the latest version, if there are errors, conflicts and other situations, resolve until no errors. 6. Submit the project, find the "Commit changes" option, select and click. Purpose: To submit the currently edited project to the server. 7. Use of "lock" and "unlock" when we are editing a file, in order to prevent others from being modified, you can make the file locked before editing, and then unlock it when we edit it and submit it. 8. Submit the project, write the detailed notes and the signature.     9. Revert to the previous version and other previous errors, please refer to the documentation later or search online. Finally, summarize the use steps

1. Item ⺫⽬ Manager initialization Item ⺫⽬ 1> item ⺫⽬ Manager to download the contents of the server to local remember to select the correct SVN version number->1.7 2> Item ⺫⽬ project Manager Create item ⺫⽬ head to Code⽂ folder 3> Item ⺫⽬ Manager ignores ⼀ some unwanted ⽂ files Xcode will help us record the ⽂ file currently being edited and stay in that ⽂ file the next time you open it. Xcode will help us record the ⺫⽬ directory open, colleagues do not need to share breakpoint information colleagues do not need to share, all also need to ignore Xcuserdata

2. Make ⽤ use Xcode's svn attention point 1> ⺫⽬ If you make the ⽤ use a static library, you must make ⽤ with the command ⾏ row Static Library added to the SVN management 2> item ⺫⽬ If you want to make ⽤ with STORYBOARD,SVN management requires special attention If can make ⽤ with xib so as far as possible to make ⽤ with Xib guarantee at the same time only ⼀ a ⼈ person in modify storyboard

3. The company makes ⽤ with the SVN technique as far as possible to modify the ⽂ file before the update, write ⼀ some code after the ⽴ immediately submit to the server if you write a lot of code today, it is recommended to submit a half ⼩ hours before work. Cornerstone the meaning of the three basic directories: Tags,branch,truck Truck Main Branch, is used to master the direction of development, a new module development, this time on the trunk, when the module development completed, need to modify, using branch. Branch: It is used for parallel development, where parallelism refers to the comparison with the trunk. Tag: is used to make a milestone, whether it is a release version, but is a usable version. Here, it should be read-only. More is a display, giving people a readable mark. We ITOO1.0 phase development completed, you can hit a tag, and then into the development of 2.0. The role of tags is to create a version ID when you merge the code of the bug that was modified on the branches into the trunk. Later, when the bug code modified on the branches is merged into the trunk, it is merged from version of tags to the latest version of branches to the trunk to ensure that the previously modified bug code is no longer merged.

Suppose an example, ITOO1.0 development is completed, this time to do a tag,tag_release_1_0, and then based on this tag to publish, such as the installation program. Trunk into the development of 1.1, but 1.0 found a bug, then you need to do a branch based on TAG_RELEASE_1_0 (branch), BRANCH_BUGFIX_1_0, based on this branch bug modification, until the end of Bugfix, Make a tag,tag_release_1_0_1 and then, as needed, decide whether the BRANCH_BUGFIX_1_0 is incorporated into the trunk.

One thing to note about SVN is that it is the global version number, which is actually a tag, so we can often see what the release is, based on the 2xxxx version of the XXX project. That's what it means. However, it also explicitly gives a tag concept, because it is more readable, after all, it is easier to remember tag_release_1_0 than to remember a large version number.

SVN is really a very powerful tool and he manages our teamwork well. Several commands (names) to note in-----------------git-----------------git push: Submit to Server Pull: Update clone: Full Download commit: Local commit one. Walkthrough of a command ⾏ Line 1. Initialize ⼀ a Code Warehouse
Git init 2. If you make ⽤ with Git you must configure ⼀ a ⽤ username and mailbox to the current git repository configuration ⼀ a ⽤ user name and mailbox
git config user.name "why"