...

CoreOS should include an installation of Git. Feel free to play around and become familiar with Git in this environment.

Forking Workflow

Going forward, we will try to follow a "forking" workflow. For comparisons of this workflow to others, see below:

• https://www.atlassian.com/git/tutorials/comparing-workflows/
• https://www.atlassian.com/pt/git/workflows

Feature Branches

The best way to avoid conflicts or collisions when merging is to isolate each subset of related changes to its own branch.

Resolving Merge Conflicts

What happens when you do have conflicts? Just follow these steps!