Good commands for starter

git add -A 
git status
git log  // git log -4 // or beautified version if setup as alias git lg
git commit -am  "commit message" // "commit message" can be freely chosen 
# for more merge conflict resultion use only
git commit # to not change commit - message: must be message with merge 
# the first time
git push -u origin master
# after that 
git push 
git pull