Reset Conflicts

The Reset Conflicts tool allows you to manually reset the state of conflicts that were previously resolved or ignored, returning them to a fresh unresolved state.
This tool works alongside Irony's automatic reset and cleanup system, which is triggered when underlying mod data changes.

---

1. How to Use Reset Conflicts

1. Open the Conflict Solver
2. Click the Reset Conflicts button
3. Choose the conflict type:
   • Resolved
   • Ignored
4. Select the folder containing the conflict
5. Select one or more definitions
6. Click Reset

Multi-select is supported using Shift / Ctrl.

Related pages:
→ Conflicted Objects
→ Conflict Filter

---

2. What Manual Reset Does

Manual reset clears Irony's stored decision for that conflict.

Resetting a Resolved Conflict

• The previously generated resolved output is removed from the patch mod
• The “resolved” state marker is cleared
• The conflict appears again as new/unresolved the next time the solver loads (if it still exists)

Use this when you want to redo a merge manually.

---

Resetting an Ignored Conflict

• No patch files are affected
• The “ignored” marker is cleared
• The conflict appears again as new/unresolved

Use this when you want to review a previously ignored conflict.

---

3. Automatic Reset (Irony’s Smart System)

Irony automatically resets conflicts when it detects that the underlying data has changed.
This includes:

• A mod update changed a file
• The definition hash no longer matches the stored resolved state
• The conflict history no longer matches
• The collection structure changed (mod added/removed), affecting relevance
• A resolved output no longer has any contributing mod (no longer referenced)

In these cases:

• Irony automatically discards the old resolution
• The conflict is shown again so the user is aware something changed
• A border indicator appears (see below)

Automatic reset ensures that outdated resolves or ignores do not silently remain in the patch mod.

---

4. Automatic Cleanup (No Conflict Remaining)

If the underlying conflict disappears completely — for example:

• a mod is removed
• the file or definition no longer exists
• no mods contribute the conflicted object anymore

Irony will automatically remove the resolved output from the patch mod, because it is no longer relevant.

In this scenario:

• No conflict is shown
• No border indicator appears
• Patch output is silently cleaned up

This behavior prevents “dangling overrides” in the patch collection.

---

5. Visual Indicators (Automatic Reset Only)

In the Conflicted Objects listbox:

• Red border → automatically reset previously resolved conflict
• Yellow border → automatically reset previously ignored conflict

These indicators appear only when Irony performs an automatic reset.

Manual reset does not show any border.

---

6. When to Use Manual Reset

Use manual Reset Conflicts when:

• You want to redo a merge by choice
• You want to clear a specific resolved entry from the patch mod
• You previously ignored a conflict and now want to handle it
• You want a clean manual starting point before merging
• You want to reset only selected conflicts (not all)

Do not use manual reset to handle mod updates — Irony already handles these automatically.

---

7. Screenshot

---

Reset Conflicts provides a precise, selective way to clear outdated decisions, while Irony’s automatic system ensures merge consistency whenever mods or definitions change.