diff --git a/comicapi/merge.py b/comicapi/merge.py
index 7a37110..a197403 100644
--- a/comicapi/merge.py
+++ b/comicapi/merge.py
@@ -58,7 +58,6 @@ class Credit:
class Mode(StrEnum):
OVERLAY = auto()
ADD_MISSING = auto()
- COMBINE = auto()
def merge_lists(old: Collection[Any], new: Collection[Any]) -> list[Any] | set[Any]:
diff --git a/comictaggerlib/ui/settingswindow.ui b/comictaggerlib/ui/settingswindow.ui
index f0bd877..1a9a2af 100644
--- a/comictaggerlib/ui/settingswindow.ui
+++ b/comictaggerlib/ui/settingswindow.ui
@@ -755,7 +755,7 @@
false
- Overlays all the non-empty values of the new metadata (e.g. Comic Vine) on top of the current metadata.
+ Overlays all the (non-list) non-empty values of the new metadata (e.g. Comic Vine) on top of the current metadata.
Example:
(Series=batman, Issue=1, Tags=[batman,joker,robin])
@@ -792,12 +792,12 @@ Example:
-
- Adds any metadata that is present in the new metadata (e.g. Comic Vine) but is missing in the current metadata.
+ Adds any (non-list) metadata that is present in the new metadata (e.g. Comic Vine) but is missing in the current metadata.
Example:
-(Series=batman, Issue=1, Tags=[batman,joker,robin])
-+ (Series=Superman, Issue=10, Publisher=DC Comics, Tags=[superman,lois lane,lex luthor])
-= (Series=batman, Issue=1, Publisher=DC Comics, Tags=[batman,joker,robin])
+(Series=batman, Issue=1)
++ (Series=Superman, Issue=10, Publisher=DC Comics)
+= (Series=batman, Issue=1, Publisher=DC Comics)
Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -808,7 +808,7 @@ Example:
- Combine
+ Lists
@@ -829,12 +829,17 @@ Example:
-
- Same as Overlay except lists (tags, characters, genres, credits, etc.) are combined, replacing duplicates with the "new" data and all other non-empty values are replaced by the "new" values.
+ All lists (tags, characters, genres, credits, etc.) are merged or replaced via the "Merge Lists" check box. Merge will replace duplicates within the list with the "new" data.
-Example:
-(Series=batman, Issue=1, Tags=[batman,joker,robin])
-+ (Series=Batman, Publisher=DC Comics, Tags=[mystery,action])
-= (Series=Batman, Issue=1, Publisher=DC Comics, Tags=[batman,joker,robin,mystery,action])
+Example Merge:
+(Tags=[batman,joker,robin])
++ (Tags=[mystery,action])
+= (Tags=[batman,joker,robin,mystery,action])
+
+Example Replace:
+(Tags=[batman,joker,robin])
++ (Tags=[mystery,action])
+= (Tags=[mystery,action])
Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -869,6 +874,9 @@ Example:
-
+
+ Merge lists (characters, tags, locations, etc.) together or the "new" list replaces the old
+
Merge Lists