equal
deleted
inserted
replaced
88 Conflict: |
88 Conflict: |
89 When pending changes to a file contradict each other (both changes cannot be applied). |
89 When pending changes to a file contradict each other (both changes cannot be applied). |
90 Resolve: |
90 Resolve: |
91 Fixing the changes that contradict each other and checking in the correct version. |
91 Fixing the changes that contradict each other and checking in the correct version. |
92 |
92 |
93 We should mention here what is distributing and centralised version control. |
93 Types of Version Control: |
|
94 ~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
95 |
|
96 Based on how source management is carried out in a tool there are two categories of Version Control Systems(VCS): |
|
97 |
|
98 - Centralized VCS: |
|
99 In this kind of system all the revision control functions are performed on a shared server. If two developers try to change the same file at the same time, without some method of managing access the developers may end up overwriting each other's work. Centralized revision control systems solve this problem in one of two different "source management models": file locking and version merging. Both svn and cvs follows this kind of management. |
|
100 |
|
101 - Distributed VCS: |
|
102 In a distributed model, every developer has their own repo. Diffs, commits, and reverts are all done locally, one needs Internet only to share the changes with others. It makes work faster, handles branching and merging in better way, with less management. hg, bzr and git uses this workflow. |
|
103 |
|
104 |
|
105 Suggested Reading: |
|
106 ------------------ |
|
107 |
|
108 * http://karlagius.com/2009/01/09/version-control-for-the-masses/ |
|
109 * http://betterexplained.com/articles/a-visual-guide-to-version-control/ |
|
110 * http://en.wikipedia.org/wiki/Revision_control |
|
111 * http://hgbook.red-bean.com/ |
|
112 * http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/ |