I ran git pull and now there are weird <<<<<<< symbols in my files. What do I do?
A merge conflict means Git could not decide automatically, because both branches changed the same lines. Git marks the problem area in the file:
Steps:
git statusto see the files marked "both modified".git add <file>for each fixed file.git commit(for a merge) orgit rebase --continue(for a rebase).If you get lost,
git merge --abort(orgit rebase --abort) takes you back to before it started.Visual Studio, VS Code and tools like the three-way merge editor make this easier. To have fewer conflicts, pull often and keep branches short-lived.