git config --global user.name "Your Name"
git config --global user.email [email protected]
git add file_a
git commit -m "add filea"
git push -u origin master
git pull
optional:fixed the conflict
git diff
git checkout -b dev
git push origin dev
git push origin :dev