Difference between revisions of "Version Control"

Version Control (edit)

516 bytes added , 20:52, 15 November 2016

no edit summary

Anonymous user

@@ Line 172: / Line 172: @@
 <br/>
 == Merge process and workflow of the individual team member ==
+<br/>
 * Download the latest .esm file from the repository, to both the \Fallout 4\Data\ folder, AND \Merging\Data\.
 * Open the Creation Kit, and begin making your changes to the .esp file.
@@ Line 188: / Line 189: @@
 * You'll now be shown a new popup titled "File Details", but it will have no contents.
 ** On your keyboard, press Shift+Ctrl+B
-* You'll be asked if you want to update the Bit Array Files, and warned it can take several minutes. Of course, click "Yes".
+* You'll be asked if you want to update the Bit Array Files, and warned it can take several minutes. Click "Yes".
 *: [[File:versioncontrol_update_bit_array_file.png]]
 * When it's finished, you'll see "Updating bit arrays...Done" in the bottom status bar of the main window
 *: [[File:versioncontrol_update_bit_array_done.png]]
+<br/>
+* With the bit array updated, you're ready to merge!
+* Cancel out of the Data window, you don't need to re-open the .esp, because you already opened it.
+* Now click the Version Control button
+*: [[File:versioncontrol_button.png]]
+* Select all the entries in the list, and click "Check Out"
+* Select all the entries again, and click "Check In"
+*: [[File:versioncontrol_changedreferences.png]]
+* Once you regain control of the window, your merge is complete!
+* Upload that masterpiece .esm file back to the repository.
 <br/>
 Good luck!
 <br/>
 <br/>