[georgeott]

Here is my daily git workflow:

1 - Clone the repo (only need do this once)

2 - git checkout branchname

3 - Make some file changes

4 - git add filenames

5 - git commit

6 - git pull (make sure you are up to date BEFORE you push to remote repo)

7 - Build and TEST

8 - git push

That's 90% of what I do.

Merging branches is simple.

1 - git checkout destinationBranch

2 - git pull

3 - git merge sourceBranch

4 - build and test

5 - git push

Cheers!