history --merge to properly interleave items

Fixes #2312

1 files changed, 6 insertions, 0 deletions

diff --git a/src/history.cpp b/src/history.cpp
index 48469759..44c153a5 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1548,6 +1548,12 @@ void history_t::incorporate_external_changes() {
     if (new_timestamp > this->boundary_timestamp) {
         this->boundary_timestamp = new_timestamp;
         this->clear_file_state();
+
+        // We also need to erase new_items, since we go through those first, and that means we
+        // will not properly interleave them with items from other instances.
+        // We'll pick them up from the file (#2312)
+        this->save_internal(false);
+        this->new_items.clear();
     }
 }