title: Getting error while merging master branch into development branch using git
body: <p>I am getting the following error while merging the master branch into my development branch using git.</p>
  <blockquote>
  <p>Error:</p>
  </blockquote>
  <pre><code>error: Merging is not possible because you have unmerged files.
  hint: Fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  hint: as appropriate to mark resolution and make a commit.
  fatal: Exiting because of an unresolved conflict.
  </code></pre>
  <p>I am explaining my process below.</p>
  <p>1- I was working with my <code>dev</code> branch locally.</p>
  <p>2- I checked out to <code>master</code> branch by using below below command.</p>
  <pre><code>  `git checkout master`
  </code></pre>
  <p>3- Then I pulled the latest code from <code>master</code> branch using the below command</p>
  <pre><code>`git pull`
  </code></pre>
  <p>4- Again I checkout to my branch using the following command</p>
  <p><code>git checkout dev (dev is my branch name which is cloned from master intially)</code></p>
  <p>5- Then I had to merge the <code>master</code> branch code to <code>dev</code> branch. so i performed the below command.</p>
  <p><code>git merge master</code></p>
  <p>6- Then only I am getting the above error.</p>
  <p>Here I need to merge the latest code from <code>master</code> branch to <code>dev</code> branch and push into to remote <code>dev</code> branch. I need to resolve this error and merge the code.</p>