In terminal when pulling or pushing changes, if we end up on the weird blue screen full of ,,,,, press :wq
If merge conflict, remove or comment out the changes we don't want and push again. A merge conflict will happen if someone and me change the same line.
before running git pull, always do git add and git commit.
always run git push Kriss master if I want to push my changes to Kriss's repo.
The database is shared accross all branches so if I make a change in the database, people need to run rake db:migrate to migrate my changes.
if I don't type git push Kriss master, the changes will just be added to my repo.