Here is my daily git workflow:<p>1 - Clone the repo (only need do this once)<p>2 - git checkout branchname<p>3 - Make some file changes<p>4 - git add filenames<p>5 - git commit<p>6 - git pull (make sure you are up to date BEFORE you push to remote repo)<p>7 - Build and TEST<p>8 - git push<p>That&#x27;s 90% of what I do.<p>Merging branches is simple.<p>1 - git checkout destinationBranch<p>2 - git pull<p>3 - git merge sourceBranch<p>4 - build and test<p>5 - git push<p>Cheers!