Github Flow

branch-based

• master -- This branch contains the production code, The development code will be merged into the master branch when the code is ready.

• develop -- This branch contains the code that is pre-production. When the features are finished they will be merged into the development branch. https://medium.com/@patrickporto/4-branching-workflows-for-git-30d0aaee7bf

• feature-* — feature branches are used to develop new features for the upcoming releases. May branch off from develop and must merge into develop.

pull-request

When you need feedback or help, or you think the branch is ready for merging, open a pull request.

merging

Merging means that different branches of code will be combined into a newer version of the code.

forking

When forking someone's repo you create an alt version of the original repo. The repo will be added to your personal repo's. And behaves as 'your' repo. It is possible to edit and change anything you want. The changes that are made could be merged to the original by creating a pull request.

Conflicts

Conflicts can happen when you try to merge different branches into one. And git cant manage the changes on its own. Probably because too much code is changed/replaced. To resolve these conflicts git will show you the old vs the new version of the code. The code has to be compared/fixed manually.