thePR0M3TH3AN/TORCH
1
0 Fork 0
mirror of https://github.com/PR0M3TH3AN/TORCH.git synced 2026-11-10 14:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Harden memory workflow to reduce merge conflicts

Browse Source
This commit is contained in:
thePR0M3TH3AN committed 2026-02-26 08:18:47 -05:00
1 parent 561bc9b4bd
commit 811f45b3af
8 files changed
+84 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitattributes
+5
View File
@@ -1,2 +1,7 @@
# Auto detect text files and perform LF normalization
* text=auto
# Reduce merge conflicts for append-style memory artifacts.
memory-updates/*.md merge=union
.scheduler-memory/latest/daily/memories.md merge=union
.scheduler-memory/latest/weekly/memories.md merge=union