I tried pulling from main and now every single file has `<<<<<<< HEAD` scattered throughout it.
Twonk9098
Admin
Rep: 9999
Replied on May 19, 2026, 2:20 am
Do not panic! Use `git merge --abort` to cancel the merge and return to your previous state. Then, coordinate with your team to see who changed those specific lines.