RumovZ c7d058aa0b Merge all conflicting notetypes (#2707) ... * Refactor import apkg tests * Merge conflicting notetypes regardless of id match Original ids are a new thing, and we need to handle previous remappings. This is done separately from the conflict resolution for notetypes with matching ids, because 1) we need to look at the notes to determine conflicts, and 2) we don't want to change the notetype of *all* existing notes with the conflicting notetype. The main reason is that for 2 existing notes with the same noteype, their incoming counterparts could have *different* notetypes. So to get rid of all conflicts, they must be resolved on a note-by-note basis. * Delete merged, now unused notetypes		2023-10-05 06:18:10 +00:00
..
package	Merge all conflicting notetypes (#2707)	2023-10-05 06:18:10 +00:00
text	Update incompatible Rust deps	2023-09-28 10:00:47 +10:00
gather.rs	Refactor progress handling (#2549)	2023-06-19 13:48:32 +10:00
insert.rs	Switch Rust import style (#2330)	2023-01-18 21:39:55 +10:00
mod.rs	Refactor service generation (#2552)	2023-06-19 15:33:40 +10:00
service.rs	Merging Notetypes on Import (#2612)	2023-09-09 09:00:55 +10:00