How to pull and merge changes into current branch from master?
<p>I am working on a branch called <code>create</code>. I have to pull the changes that are made into my branch. I already have done -  </p>

<p><code>git checkout master</code></p>

<p><code>git pull origin master</code></p>

<p>and now I have to merge it. What's the way to merge it?</p>