Difference between revisions of "Version Control"
no edit summary
imported>HaploTR |
imported>HaploTR |
||
| Line 149: | Line 149: | ||
* User 1 downloads version 1 of the master file | * User 1 downloads version 1 of the master file | ||
* User 1 modifies Layer 1 | * User 1 modifies Layer 1 | ||
<br/> | |||
* User 2 also downloads version 1 of the master file | * User 2 also downloads version 1 of the master file | ||
* User 2 modifies Layer 2 | * User 2 modifies Layer 2 | ||
** This is okay, because User 1 and User 2 have communicated and understand the scope and direction of each other's changes. They know what sections of the level the other is modifying, and their changes will not collide. | ** This is okay, because User 1 and User 2 have communicated and understand the scope and direction of each other's changes. They know what sections of the level the other is modifying, and their changes will not collide. | ||
<br/> | |||
* User 1 merges his modifications of Layer 1 into the .esm file | * User 1 merges his modifications of Layer 1 into the .esm file | ||
* User 1 uploads version 2 of the .esm to the repository | * User 1 uploads version 2 of the .esm to the repository | ||
<br/> | |||
* User 2 waits for User 1 to finish his merge. | * User 2 waits for User 1 to finish his merge. | ||
* User 2 downloads version 2 of the master file, to ensure it retains all the changes that User 1 just made | * User 2 downloads version 2 of the master file, to ensure it retains all the changes that User 1 just made | ||
* User 2 merges his modification of Layer 2 into the new .esm file | * User 2 merges his modification of Layer 2 into the new .esm file | ||
* User 2 uploads version 3 of the .esm to the repository | * User 2 uploads version 3 of the .esm to the repository | ||
<br/> | |||
* User 3 is also in communication with the other users, and he also needs to modify Layer 1 | * User 3 is also in communication with the other users, and he also needs to modify Layer 1 | ||
* User 3 must wait until User 1 is finished before he starts modifying Layer 1, or their changes will collide | * User 3 must wait until User 1 is finished before he starts modifying Layer 1, or their changes will collide | ||
| Line 168: | Line 168: | ||
* User 3 merges his modifications of Layer 1 into the .esm file | * User 3 merges his modifications of Layer 1 into the .esm file | ||
* User 3 uploads version 4 of the .esm to the repository | * User 3 uploads version 4 of the .esm to the repository | ||
<br/> | |||
And the project continues on and on in similar fashion! | |||