Files
notes/_ARCHIVE/misc_notes/Conflict Fix.md
T
2026-07-14 08:05:36 -07:00

4 lines
128 B
Markdown

1. Open note vault directory in terminal
2. `'bash git merge -abort`
3. `'bash git reset --hard origin/main`
4. `'bash git pull`