git pull and resolve conflicts

Question

I am learning git and I have a scenario:

1. My coworker makes changes and pushes the changes to the master.
2. I make changes locally to my master.

Answer 1

I believe git sync would be good. Git sync commits your changes, pulls any changes existing in master, then pushes all the changes together to master.