Merge Viewer
This section will list all valid detected conflicts. It doesn't matter whether you pick a definition to be on the left or the right side.
On all text based conflicts you will notice a special definition usually called "IronyModManager_[name of the collection]" colored green. This is a special virtual definition on which only merge actions can be performed. The virtual definition is created from the content of the definition colored orange in the list (unless conflict history is available). Once a conflict is resolved Irony Mod Manager will store the resolved code in a state.json file in the patch mod collection and if available this code will be used for virtual definition.
- Green
This is a virtual definition on which you can perform editing actions
- Orange
This is the virtual definition which Irony has taken as the default one and copied its content (unless conflict history is available as previously stated). This definition was chosen by Irony as it believes it will be the one used by the game. On this definition you may also notice the following terms appended:
- FIOS
- LIOS
- Load Order
- Override (This is shown in advanced conflict solver mode and indicates that this definition wins due to dependencies tag)
These indicate the reason why the definition was chosen. For more information about this terminology please visit the Stellaris Modding Wiki. If you are an experienced Stellaris modder and find that an item has been flagged as a false positive please report this on the issue tracker. Irony only uses publicly available information from the modding wiki to make such assumptions and information can be erroneous at times.
The code is readonly (if you use old viewer) and cannot be directly edited. The merge process offers the following actions:
- Next\Prev conflict
Finds next\prev conflict.
- Copy text
Copies definition code to clipboard.
- Copy all
This action will copy all code blocks to the virtual definition. Consider this as a shortcut to CTRL-A and Copy this.
- Copy this
This action will copy the selected code block to the virtual definition.
- Copy this before line
This action will copy the selected code block to the virtual definition before the highlighted code block.
- Copy this after line
This action will copy the selected code block to the virtual definition after the highlighted code block.
The merge process offers the following actions:
- External Merge
If you configured an external editor on the options screen this context menu action will be visible. By clicking it Irony will launch the external diff viewer and wait for you to finish editing before taking back the changes made in the external editor. Be sure to save the changes via the external editor before toggling confirm button to signal Irony to take back the changes.
-
Toggle Diff Compare Mode Toggles between 2 new different modes (new and old). New is more advanced winmerge like experience while the old is the legacy editor available since the earliest Irony version.
-
Next\Prev conflict
Finds next\prev conflict.
- Copy text
Copies definition code to clipboard.
- Edit
Allows you to edit the virtual definition code directly in a textbox.
- Move up\down
Moves the selected code block up or down.
Resolving a conflict will write the virtual definition code to the patch collection. The conflict will disappear from the conflicted objects tree view. Conflicted objects will only be shown again (when conflict solver is run again) under these conditions:
- Mod collection has been changed (mod added\removed)
- An existing definition was changed (due to a mod update)
- Conflict was reset using "Reset Conflicts" feature
Ignoring a conflict will tell Irony to ignore this conflict until the contents of the conflicted objects change again. After that point the conflict will be shown again. From that point on you can also ignore or resolve it again.
Navigates back to the main screen.