title: Why does a conflicted file appear both staged and unstaged in Git?
body: <p><a href="https://i.stack.imgur.com/E5ZUo.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/E5ZUo.png" alt="enter image description here"></a></p>
  
  <p>I've been experimenting with Git for the purposes of writing a Git tutorial. I created a branch, modified the file on both branches, then merged the branch back to master to generate a conflict. What I'm curious about is why the conflicted file appears to be both "staged" and "unstaged". If I click the file in either place the diff window shows the exact same information.</p>