User:Nearox/SRLE Explorers Conflict Resolution: Difference between revisions
No edit summary |
No edit summary |
||
| Line 12: | Line 12: | ||
==== Cell ==== | ==== Cell ==== | ||
===== Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> \ | |||
===== Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> ===== | |||
'''Conflict Resolution:''' Use record from ''ELE_Legendary_Fs_Wt_Lite.esp''. <br> | |||
'''Problem Resolved:''' Needs to put into the Explorer's Edition Conflict Resolution ESP in order to facilitate the succesful merging of subrecord 00064110. | |||
===== Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> \ Persistent \ 00064110 ===== | |||
'''Conflict Resolution:''' Use record from ''Immersive Citizens - AI Overhaul Merged.esp'' then move the Record flags from ''3DNPC.esp''.<br> | '''Conflict Resolution:''' Use record from ''Immersive Citizens - AI Overhaul Merged.esp'' then move the Record flags from ''3DNPC.esp''.<br> | ||
'''Problem Resolved:''' Changes from '' Interesting NPCs'' and ''Immersive Citizens'' needed to be merged. | '''Problem Resolved:''' Changes from '' Interesting NPCs'' and ''Immersive Citizens'' needed to be merged. | ||
===== | ===== Template ===== | ||
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | '''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | ||
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | '''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | ||
===== | ===== Template ===== | ||
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | '''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | ||
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | '''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | ||
===== | ===== Template ===== | ||
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | '''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | ||
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | '''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | ||
===== | ===== Template ===== | ||
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | '''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | ||
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | '''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | ||
Revision as of 14:50, October 4, 2015
SRLE - Explorer's Edition
Conflict Resolution Subguide
Last Update: 14:50:49 4 October 2015 (UTC)
Conflicts and Fixes
Armor
Cell
Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn>
Conflict Resolution: Use record from ELE_Legendary_Fs_Wt_Lite.esp.
Problem Resolved: Needs to put into the Explorer's Edition Conflict Resolution ESP in order to facilitate the succesful merging of subrecord 00064110.
Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> \ Persistent \ 00064110
Conflict Resolution: Use record from Immersive Citizens - AI Overhaul Merged.esp then move the Record flags from 3DNPC.esp.
Problem Resolved: Changes from Interesting NPCs and Immersive Citizens needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
{{#css:User:Neovalen/Skyrim_Revisited.css}}
