Difference between revisions of "Arcane University:Masterfile Merging with Perforce"
(→Merge Process) |
|||
| Line 5: | Line 5: | ||
==Merge Process== | ==Merge Process== | ||
| + | |||
1. udpate master from git: mods/SE-Assets/ right click -Update/ Git Bash / git pull | 1. udpate master from git: mods/SE-Assets/ right click -Update/ Git Bash / git pull | ||
| + | |||
2. add BSAssets.esm in SSE/Merging/Data | 2. add BSAssets.esm in SSE/Merging/Data | ||
| − | 3. add recent Atmora.esm in SSE/ | + | |
| + | 3. add recent Atmora.esm in SSE/Mergin/Data | ||
| + | |||
4. clean esps in X-Edit (check for errors, apply filter to show conflicts (selected files only) | 4. clean esps in X-Edit (check for errors, apply filter to show conflicts (selected files only) | ||
| + | |||
5. zmerge -> all into one esp | 5. zmerge -> all into one esp | ||
| − | 6. esp from zmerge/merge into git folder of | + | |
| − | 7. enable CreationKitCustom.ini version control =1, make Sure the merge esm is also placed in merge Data repository for perforce | + | 6. esp from zmerge/merge into git folder of your project |
| + | |||
| + | 7. enable CreationKitCustom.ini version control =1, make Sure the merge esm is also placed in merge Data repository for perforce | ||
| + | |||
8. activate Skyrim merge esm in MO | 8. activate Skyrim merge esm in MO | ||
| + | |||
9. update bit arrays in CK for BSAssets and Atmora (ctrl + shift +b), both must be loaded inside CK! | 9. update bit arrays in CK for BSAssets and Atmora (ctrl + shift +b), both must be loaded inside CK! | ||
| + | |||
10. Merging load Version Control when you have the patch-esp as active file, then check out and check in. Make sure masters have been identical when loading. | 10. Merging load Version Control when you have the patch-esp as active file, then check out and check in. Make sure masters have been identical when loading. | ||
| + | |||
11. merged esm out of VersionControl folder into git folder | 11. merged esm out of VersionControl folder into git folder | ||
| + | |||
12. push with git: git status, git add ., git commit -m "mmm", git push | 12. push with git: git status, git add ., git commit -m "mmm", git push | ||
[[Category:Arcane University]][[Category:Arcane University-Implementation]] | [[Category:Arcane University]][[Category:Arcane University-Implementation]] | ||
Latest revision as of 16:07, 13 November 2022
Perforce Installation[edit]
(will soon be added) also see at the end of this video: https://www.youtube.com/watch?v=tCeh1YEJ4AY
Merge Process[edit]
1. udpate master from git: mods/SE-Assets/ right click -Update/ Git Bash / git pull
2. add BSAssets.esm in SSE/Merging/Data
3. add recent Atmora.esm in SSE/Mergin/Data
4. clean esps in X-Edit (check for errors, apply filter to show conflicts (selected files only)
5. zmerge -> all into one esp
6. esp from zmerge/merge into git folder of your project
7. enable CreationKitCustom.ini version control =1, make Sure the merge esm is also placed in merge Data repository for perforce
8. activate Skyrim merge esm in MO
9. update bit arrays in CK for BSAssets and Atmora (ctrl + shift +b), both must be loaded inside CK!
10. Merging load Version Control when you have the patch-esp as active file, then check out and check in. Make sure masters have been identical when loading.
11. merged esm out of VersionControl folder into git folder
12. push with git: git status, git add ., git commit -m "mmm", git push
