Barrett Ruth a192830d8c fix(conflict): clear stale diagnostics before re-enabling ... Problem: after resolving all conflicts, vim.diagnostic.enable(true) restored diagnostics that were cached while markers were present, showing errors like "unexpected token end" on clean code. Solution: call vim.diagnostic.reset() before re-enabling to flush stale results and let the LSP re-analyze the resolved buffer.		2026-02-07 19:47:45 -05:00
..
diffs	fix(conflict): clear stale diagnostics before re-enabling	2026-02-07 19:47:45 -05:00