title: Git - How to update master branch on my machine without loss of work?
body: <p>Version control is something new for me. I searched for about my problem but I did not found the answer I would like. Maybe I'm not using the correct terms.</p>
  
  <p>I'm working in some new features of a project. I took the master branch last week and started to work. Now, the master branch on remote is more updated than mine because another guy made some emergency fixes.</p>
  
  <p>So, how could I update the local master branch without loss of work? I think I should commit my work, pull from origin/master again, and merge with my own branch. Is that the right thing to do? I didn't do this yet beacause I'm not secure about it. It's too many work, and lose it would be really to bad.</p>