Paul's Python CoursePPC

Merge conflicts

Not met yet

A conflict happens when both branches changed the same lines since they split. Git writes both versions into the file between <<<<<<<, ======= and >>>>>>> markers and waits. You edit the file to say what it should be, delete the markers, then git add and git commit to finish. git merge --abort backs out.

Try it

main.py

Output

Press Run and what your program prints shows up here.

Easy to get wrong

  • Thinks a merge conflict means the repository is broken.
  • Thinks git removes conflict markers by itself after the file is edited.

Where it comes up