Collaborating using Git and GitHub & Merge Conflicts

Use the power of Git and GitHub to streamline collaboration on a research project.
Image credit: Art by Allison Horst

Description

Git is a great tool for working independently, but even better for working with friends and colleagues. Git allows you to work on your local copy of files with the confidence that you can successfully synchronize your changes with the changes made by others. This lesson presents step-by-step how to start collaborating with colleagues and avoiding conflicts. It also walks you through what can cause a merge conflict, how to solve a merge conflict, and things to consider to avoid conflicts in general.

Prerequisites

• Introduction to Git and GitHub lesson (or be familiar with the content of the lesson)

Learning Goal

• Introduce how to use Git and GitHub to collaborate with colleagues on code
• Revise what typically causes conflicts when collaborating
• Demonstrate and practice how to resolve a conflict
• Describe workflows to avoid conflicts

Duration

2 hours