|
|
2a4cfcaee3
|
Sync 2026-04-14 22:20
|
2026-04-14 22:20:03 +00:00 |
|
|
|
35e534e126
|
Sync 2026-04-14 20:20
|
2026-04-14 20:20:04 +00:00 |
|
|
|
b64bbad44a
|
Sync 2026-04-14 18:20
|
2026-04-14 18:20:03 +00:00 |
|
|
|
6c11196996
|
Sync 2026-04-14 16:20
|
2026-04-14 16:20:04 +00:00 |
|
|
|
fcfb6af1eb
|
Sync 2026-04-14 14:20
|
2026-04-14 14:20:03 +00:00 |
|
|
|
c8ea5a5aa5
|
Sync 2026-04-14 12:20
|
2026-04-14 12:20:04 +00:00 |
|
|
|
0d46d4a900
|
Sync 2026-04-14 10:20
|
2026-04-14 10:20:04 +00:00 |
|
|
|
1a34b59f42
|
Sync 2026-04-14 08:20
|
2026-04-14 08:20:05 +00:00 |
|
|
|
5d6d6f32d7
|
Sync 2026-04-14 14:40
|
2026-04-14 14:40:03 +08:00 |
|
|
|
5cec3fd321
|
Sync 2026-04-14 14:28
|
2026-04-14 14:28:33 +08:00 |
|
|
|
47c609c886
|
Sync 2026-04-14 06:28
|
2026-04-14 06:28:27 +00:00 |
|
|
|
781526de56
|
stop tracking state_merged.db (binary merge conflict)
|
2026-04-14 06:28:17 +00:00 |
|
|
|
1c36b771ff
|
Sync 2026-04-14 06:27
|
2026-04-14 06:27:31 +00:00 |
|
|
|
3dd382198d
|
Sync 2026-04-14 15:25
|
2026-04-14 15:25:29 +09:00 |
|
|
|
b46bc8ef6a
|
Merge remote-tracking branch 'origin/main'
|
2026-04-14 15:25:28 +09:00 |
|
|
|
f888bae907
|
Sync 2026-04-14 14:00
|
2026-04-14 14:00:35 +09:00 |
|
|
|
da764ab901
|
Sync 2026-04-14 02:20
|
2026-04-14 02:20:04 +00:00 |
|
|
|
0a8e6b5ac9
|
Sync 2026-04-14 00:20
|
2026-04-14 00:20:04 +00:00 |
|
|
|
e89a6618d4
|
Sync 2026-04-14 07:31
|
2026-04-14 07:31:17 +08:00 |
|
|
|
ad9b6b7d98
|
Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync
|
2026-04-14 08:29:18 +09:00 |
|
|
|
5ab10d466d
|
Fix: remove state_merged.db before git pull to avoid conflicts
|
2026-04-14 08:29:14 +09:00 |
|
|
|
dc2e9fcbb6
|
Sync 2026-04-13 23:28
|
2026-04-13 23:28:44 +00:00 |
|
|
|
251f7480c3
|
Fix step numbers in sync.sh
|
2026-04-14 08:23:48 +09:00 |
|
|
|
738bd5b762
|
Fix: stage state_merged.db after merge
|
2026-04-14 08:23:33 +09:00 |
|
|
|
2dce9223e0
|
Add merged state DB
|
2026-04-14 08:23:21 +09:00 |
|
|
|
56bea3d587
|
Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync
|
2026-04-14 07:16:39 +08:00 |
|
|
|
a4ac06e8f0
|
Sync 2026-04-14 07:16
|
2026-04-14 07:16:37 +08:00 |
|
|
|
074af516be
|
Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync
|
2026-04-13 23:07:40 +00:00 |
|
|
|
b8192bd321
|
Sync 2026-04-13 23:07
|
2026-04-13 23:07:38 +00:00 |
|
|
|
12d1ee08be
|
Sync 2026-04-14 08:07
|
2026-04-14 08:07:18 +09:00 |
|
|
|
eeed2f14d5
|
Sync 2026-04-14 08:03
|
2026-04-14 08:03:42 +09:00 |
|
|
|
e365377625
|
Rewrite sync.sh with proper SQLite merge
|
2026-04-14 08:00:05 +09:00 |
|
|
|
eda4e016da
|
Merge remote-tracking branch 'origin/main'
|
2026-04-14 07:58:54 +09:00 |
|
|
|
3a260665f7
|
Update gitignore for SQLite WAL files
|
2026-04-14 07:58:03 +09:00 |
|
|
|
209487e393
|
Sync 2026-04-13 22:51
|
2026-04-13 22:51:52 +00:00 |
|
|
|
6f3ba33e02
|
Sync 2026-04-14 06:44
|
2026-04-14 06:44:22 +08:00 |
|
|
|
311690ce93
|
Resolve conflict, use local sync.sh
|
2026-04-14 07:42:09 +09:00 |
|
|
|
1acb81e7c0
|
Update sync script for bidirectional merge
|
2026-04-14 07:41:50 +09:00 |
|
|
|
df6ec8d6e1
|
Sync 2026-04-14 06:33
|
2026-04-14 06:33:02 +08:00 |
|
|
|
1eba2bca95
|
Sync all skills and memories 2026-04-14 07:27
|
2026-04-14 07:27:20 +09:00 |
|
|
|
516bb44fe6
|
Setup hermes sync with memories and github skill
|
2026-04-14 07:22:10 +09:00 |
|
|
|
e32b284bc2
|
add gitignore and sync script
|
2026-04-14 07:21:51 +09:00 |
|
|
|
49774009be
|
Initial hermes sync setup
|
2026-04-14 07:21:33 +09:00 |
|
