Resolving Merge Conflicts

Languages

In this video, I look at how to resolve a “merge conflict” using the GitHub interface.

  • Editing

    by Mathieu Blanchette

  • Animations

    by Jason Heglund