This is the second part of a follow-along series on GitHub collaboration. In the first part, two coworkers, Sofi and Alec started working on a data cleaning project where they distributed tasks between each other, created and cloned repositories and made their first commits.

We will be covering specific topics like:

1. Getting started on GitHub: Collaborate on GitHub like Pro: Part1
2. **Git Branch : **Collaborate on GitHub like Pro: Part2
3. **Commit Git: **Collaborate on GitHub like Pro: Commit

In these articles, we will have two people collaborating on GitHub. Let’s give them two pseudonyms, Sofi and Alec.

Table of Contents:

1. Branching
2. Different branching workflows on Git
3. Pull request
4. Merge conflict

---

Sofi and Alec: The repository is ready for us to work. But we need to isolate our work, else we will start overwriting each others work/codes. Lets learn about branches before we proceed.

Branching

Before going into branching workflow, let’s try to understand the concept of branch. A branch takes a copy of the latest version of the commit it’s branched from. Therefore you can work on your tasks in an isolated environment without making changes directly into the master branch. Once the task is completed, this branch can be merged into the master branch. Let’s create a branch to understand the concept better.

#git-merge #resolving-conflicts #git-create-branch #git-pull-request #git-switch-branch