This repository will show you a basic git workflow for individuals or small teams Some conflicting text from master branch I made this change from the merge-conflict-branch