This is the best way to work as a team?

First commit from local machine
THis was the third commit from the vpc...
Going back to the web

Here on the web, I have changed hello.txt again!
Edit from the local machine but there are changes online!
Merge branch 'master' of https://github.com/rickypmusic/js

Conflicts:
	hello.txt
Adding in the first java file from local machine
Added print line from local machine...
Added in a print line from the vpc
Merge branch 'master' of https://github.com/rickypmusic/js

Conflicts:
	src/main.java
This is a change made on the local machine
Merge branch 'master' of https://github.com/rickypmusic/js
Took out the junk from main.java. Did this from the vpc...
This was an addition of local_branch_file.txt for testing. From local machine
Merge branch 'master' of https://github.com/rickypmusic/js into local_branch
issue fixed [issue 1]
fix for issue 2 [issue 2]
Merge branch 'issue1'
Fixed issue 3! YAY! [issue 3]
Merge branch 'master' of https://github.com/rickypmusic/js
First fixed issue 3.1! [issue 3.1]