Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 394d149954 Sync 2026-04-17 12:20 main Mixer 2026-04-17 12:20:11 +00:00
• ddbfe5a321 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 20:00:06 +09:00
• 67e1c19dee Sync 2026-04-17 20:00 Mixer 2026-04-17 20:00:05 +09:00
• 7d368e52c2 Sync 2026-04-17 10:20 Mixer 2026-04-17 10:20:09 +00:00
• 76fa3117ca Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 18:00:04 +09:00
• e1399098f0 Sync 2026-04-17 18:00 Mixer 2026-04-17 18:00:03 +09:00
• e93a8c3bef Sync 2026-04-17 08:20 Mixer 2026-04-17 08:20:07 +00:00
• a842f38cc2 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 16:00:04 +09:00
• a5c9c8d687 Sync 2026-04-17 16:00 Mixer 2026-04-17 16:00:04 +09:00
• 16aaa54d4f Sync 2026-04-17 06:20 Mixer 2026-04-17 06:20:07 +00:00
• 3211c9b953 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 14:00:03 +09:00
• 87955f80e0 Sync 2026-04-17 14:00 Mixer 2026-04-17 14:00:02 +09:00
• d6759f9fd7 Sync 2026-04-17 04:20 Mixer 2026-04-17 04:20:06 +00:00
• 2e3d83cbab Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 12:00:02 +09:00
• fe76773cb5 Sync 2026-04-17 12:00 Mixer 2026-04-17 12:00:02 +09:00
• 9298ebf965 Sync 2026-04-17 02:20 Mixer 2026-04-17 02:20:04 +00:00
• 50000c0dc0 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 10:00:03 +09:00
• e03ac06f03 Sync 2026-04-17 10:00 Mixer 2026-04-17 10:00:02 +09:00
• d95b580e5f Sync 2026-04-17 00:20 Mixer 2026-04-17 00:20:05 +00:00
• 3615ca15bc Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 08:00:03 +09:00
• 0f173943ee Sync 2026-04-17 08:00 Mixer 2026-04-17 08:00:02 +09:00
• 5428ccc4c2 Sync 2026-04-16 22:20 Mixer 2026-04-16 22:20:04 +00:00
• d2f91e941c Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 06:00:02 +09:00
• e0345a68fc Sync 2026-04-17 06:00 Mixer 2026-04-17 06:00:02 +09:00
• 6fa45102ca Sync 2026-04-16 20:20 Mixer 2026-04-16 20:20:04 +00:00
• 1dddeb3318 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 04:00:03 +09:00
• b994fb85b8 Sync 2026-04-17 04:00 Mixer 2026-04-17 04:00:02 +09:00
• 148bec815b Sync 2026-04-16 18:20 Mixer 2026-04-16 18:20:04 +00:00
• 64b344b64c Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 02:00:02 +09:00
• 59c6dd974b Sync 2026-04-17 02:00 Mixer 2026-04-17 02:00:02 +09:00
• 58841a133b Sync 2026-04-16 16:20 Mixer 2026-04-16 16:20:04 +00:00
• 55156989c8 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-17 00:00:02 +09:00
• 73a14eacb4 Sync 2026-04-17 00:00 Mixer 2026-04-17 00:00:02 +09:00
• 27050cd06c Sync 2026-04-16 14:20 Mixer 2026-04-16 14:20:04 +00:00
• d5a8d954a1 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-16 22:51:50 +09:00
• b521283903 Sync 2026-04-16 22:51 Mixer 2026-04-16 22:51:49 +09:00
• 3caff4fa9f Sync 2026-04-16 12:20 Mixer 2026-04-16 12:20:03 +00:00
• 5420ee1cb7 Sync 2026-04-16 10:20 Mixer 2026-04-16 10:20:04 +00:00
• 3a291d78af Sync 2026-04-16 08:20 Mixer 2026-04-16 08:20:04 +00:00
• 9842015eaf Sync 2026-04-16 06:20 Mixer 2026-04-16 06:20:04 +00:00
• 5e0603c079 Sync 2026-04-16 04:20 Mixer 2026-04-16 04:20:03 +00:00
• efb2a4a1aa Sync 2026-04-16 02:20 Mixer 2026-04-16 02:20:04 +00:00
• 374ea026e8 Sync 2026-04-16 00:20 Mixer 2026-04-16 00:20:03 +00:00
• 09286f5abd Sync 2026-04-15 22:20 Mixer 2026-04-15 22:20:04 +00:00
• a8390dc49c Sync 2026-04-15 20:20 Mixer 2026-04-15 20:20:03 +00:00
• 5ef6acf77e Sync 2026-04-15 18:20 Mixer 2026-04-15 18:20:04 +00:00
• 7660209de8 Sync 2026-04-15 16:20 Mixer 2026-04-15 16:20:04 +00:00
• 3df2174a4a Sync 2026-04-15 14:20 Mixer 2026-04-15 14:20:04 +00:00
• d079e0eb5f Sync 2026-04-15 12:20 Mixer 2026-04-15 12:20:04 +00:00
• 70ebc57990 Sync 2026-04-15 10:20 Mixer 2026-04-15 10:20:04 +00:00
• 60e9188e53 Sync 2026-04-15 08:20 Mixer 2026-04-15 08:20:04 +00:00
• 649985db97 Sync 2026-04-15 06:20 Mixer 2026-04-15 06:20:04 +00:00
• 65fdd51495 Sync 2026-04-15 04:20 Mixer 2026-04-15 04:20:04 +00:00
• 5d0d72cbc4 Sync 2026-04-15 02:20 Mixer 2026-04-15 02:20:03 +00:00
• 7805305100 Sync 2026-04-15 00:20 Mixer 2026-04-15 00:20:04 +00:00
• 2a4cfcaee3 Sync 2026-04-14 22:20 Mixer 2026-04-14 22:20:03 +00:00
• 35e534e126 Sync 2026-04-14 20:20 Mixer 2026-04-14 20:20:04 +00:00
• b64bbad44a Sync 2026-04-14 18:20 Mixer 2026-04-14 18:20:03 +00:00
• 6c11196996 Sync 2026-04-14 16:20 Mixer 2026-04-14 16:20:04 +00:00
• fcfb6af1eb Sync 2026-04-14 14:20 Mixer 2026-04-14 14:20:03 +00:00
• c8ea5a5aa5 Sync 2026-04-14 12:20 Mixer 2026-04-14 12:20:04 +00:00
• 0d46d4a900 Sync 2026-04-14 10:20 Mixer 2026-04-14 10:20:04 +00:00
• 1a34b59f42 Sync 2026-04-14 08:20 Mixer 2026-04-14 08:20:05 +00:00
• 5d6d6f32d7 Sync 2026-04-14 14:40 Mixer 2026-04-14 14:40:03 +08:00
• 5cec3fd321 Sync 2026-04-14 14:28 Mixer 2026-04-14 14:28:33 +08:00
• 47c609c886 Sync 2026-04-14 06:28 Mixer 2026-04-14 06:28:27 +00:00
• 781526de56 stop tracking state_merged.db (binary merge conflict) Mixer 2026-04-14 06:28:17 +00:00
• 1c36b771ff Sync 2026-04-14 06:27 Mixer 2026-04-14 06:27:31 +00:00
• 3dd382198d Sync 2026-04-14 15:25 Mixer 2026-04-14 15:25:29 +09:00
• b46bc8ef6a Merge remote-tracking branch 'origin/main' Mixer 2026-04-14 15:25:28 +09:00
• f888bae907 Sync 2026-04-14 14:00 Mixer 2026-04-14 14:00:35 +09:00
• da764ab901 Sync 2026-04-14 02:20 Mixer 2026-04-14 02:20:04 +00:00
• 0a8e6b5ac9 Sync 2026-04-14 00:20 Mixer 2026-04-14 00:20:04 +00:00
• e89a6618d4 Sync 2026-04-14 07:31 Mixer 2026-04-14 07:31:17 +08:00
• ad9b6b7d98 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-14 08:29:18 +09:00
• 5ab10d466d Fix: remove state_merged.db before git pull to avoid conflicts Mixer 2026-04-14 08:29:14 +09:00
• dc2e9fcbb6 Sync 2026-04-13 23:28 Mixer 2026-04-13 23:28:44 +00:00
• 251f7480c3 Fix step numbers in sync.sh Mixer 2026-04-14 08:23:48 +09:00
• 738bd5b762 Fix: stage state_merged.db after merge Mixer 2026-04-14 08:23:33 +09:00
• 2dce9223e0 Add merged state DB Mixer 2026-04-14 08:23:21 +09:00
• 56bea3d587 Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-14 07:16:39 +08:00
• a4ac06e8f0 Sync 2026-04-14 07:16 Mixer 2026-04-14 07:16:37 +08:00
• 074af516be Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync Mixer 2026-04-13 23:07:40 +00:00
• b8192bd321 Sync 2026-04-13 23:07 Mixer 2026-04-13 23:07:38 +00:00
• 12d1ee08be Sync 2026-04-14 08:07 Mixer 2026-04-14 08:07:18 +09:00
• eeed2f14d5 Sync 2026-04-14 08:03 Mixer 2026-04-14 08:03:42 +09:00
• e365377625 Rewrite sync.sh with proper SQLite merge Mixer 2026-04-14 08:00:05 +09:00
• eda4e016da Merge remote-tracking branch 'origin/main' Mixer 2026-04-14 07:58:54 +09:00
• 3a260665f7 Update gitignore for SQLite WAL files Mixer 2026-04-14 07:58:03 +09:00
• 209487e393 Sync 2026-04-13 22:51 Mixer 2026-04-13 22:51:52 +00:00
• 6f3ba33e02 Sync 2026-04-14 06:44 Mixer 2026-04-14 06:44:22 +08:00
• 311690ce93 Resolve conflict, use local sync.sh Mixer 2026-04-14 07:42:09 +09:00
• 1acb81e7c0 Update sync script for bidirectional merge Mixer 2026-04-14 07:41:50 +09:00
• df6ec8d6e1 Sync 2026-04-14 06:33 Mixer 2026-04-14 06:33:02 +08:00
• 1eba2bca95 Sync all skills and memories 2026-04-14 07:27 Mixer 2026-04-14 07:27:20 +09:00
• 516bb44fe6 Setup hermes sync with memories and github skill Mixer 2026-04-14 07:22:10 +09:00
• e32b284bc2 add gitignore and sync script Mixer 2026-04-14 07:21:51 +09:00
• 49774009be Initial hermes sync setup Mixer 2026-04-14 07:21:33 +09:00