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. It is recommended however to put the definition that you are merging on the right side but it is not required.
On all text based conflicts you will notice a special definition usually called "IronyModManager_[name of the collection]". This is a special virtual definition created on which only merge actions can be performed. The virtual definition is created from the content of the first definition 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.
The code is readonly and cannot be directly edited, this was done in order to make the tool friendly for inexperienced users. The merge process offers the following actions:
- Next\Prev conflict
Finds next\prev conflict.
- Copy text
Copies definition code to clipboard.
- 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:
- 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 do the patch collection. The conflict will dissapear 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)
Navigates back to the main screen.