-----commit your changes----- $ git add . $ git commit -m ’-----message-----’

-----pull changes from master----- $ git pull origin master $ yarn install -----check which files conflict----- $ git status

-------resolve conflicts----- $ git push origin ----branchname----