Advanced Collaboration Intro

In this chapter we’ll move on to a more advanced but far more realistic collaborative workflow where contributions are made by team mates that are all collaborators on the same repository.

We’ll be:

• working in branches off the main branch (similar to forks but internal to the repository).
• pull requests to contribute code back to the main branch
• employing code review of pull requests
• deploying continuous integration to run automatic tests and checks on pull requests
• practicing resolving code conflicts between pull requests.

GitHub Workflow

Branching is a core concept in Git. There’s only one rule: anything in the main branch is always deployable (i.e. it works!).

it’s extremely important that your new branch is created off of main when working on a feature or a fix. Your branch name should be descriptive, so that others can see what is being worked on.