From f3917831f9303915986c33a73eb240da25ea980e Mon Sep 17 00:00:00 2001
From: meejah <>
Date: Wed, 7 Feb 2024 01:32:51 +0000
Subject: [PATCH] [Imported from Trac: page WeeklyMeeting, version 223]

---
 WeeklyMeeting.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WeeklyMeeting.md b/WeeklyMeeting.md
index 2d89704..8b404d6 100644
--- a/WeeklyMeeting.md
+++ b/WeeklyMeeting.md
@@ -25,6 +25,19 @@ We usually meet in <https://meet.jit.si/AccurateFiltersManipulate> (but open to
 
 ## Notes from 2024 Meetings
 
+### February 6, 2024
+
+attendees: meejah, chris
+
+Open-ended discussion / brainstorming about:
+
+- aspects of magic-folder conflict resolution (for >2 party conflicts).
+- very broad outline of work required to be able to specify keys for mutable directories
+- general next steps for both of the above:
+  - chris will be looking into Rust library + Python bindings for BIP39 -> key transforms
+  - meejah working through test-cases for magic-folder conflict resolution
+  - medium-term: Gridsync / UX for above
+
 ### January 30, 2024