title: Git pull after local commit
body: <p>I am new to git. I have a few local commits but I want to pull the latest code from the repository and don't yet want to push mine. However git pull, creates unnecessary merges. What is the right way to do this i.e update your local repository without losing the changes.</p>