Difference between revisions of "Version Control"
no edit summary
imported>HaploTR |
imported>HaploTR |
||
| Line 123: | Line 123: | ||
<br/> | <br/> | ||
There are a few things to remember with multiple team members working on the same master file. | There are a few things to remember with multiple team members working on the same master file. | ||
* When you initiate a merge, make sure the latest .esm file from the repository is in the Merging\Data folder, not the regular folder. | |||
* Merges into the .esm by different people must be done one a time. | * Merges into the .esm by different people must be done one a time. | ||
** If two people were to make local edits to the mod, and then merge into their local .esm at the same time, work will be lost when both people go and upload the latest master file to the repository. | ** If two people were to make local edits to the mod, and then merge into their local .esm at the same time, work will be lost when both people go and upload the latest master file to the repository. | ||