title: to finish reverting please merge and commit the change
body: <p>I got this weird as cow behavior from the git app. I basically want to revert to one of the past commit. The app keeps telling me to merge and commit changes. While there nothing to commit. All the new code were committed already.</p>
  <p>How can I fix this thing?</p>
  <p>And screenshot<a href="https://i.stack.imgur.com/BIrOh.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/BIrOh.png" alt="enter image description here" /></a></p>
  <p><a href="https://i.stack.imgur.com/0oEy3.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/0oEy3.png" alt="enter image description here" /></a></p>
  <p><a href="https://i.stack.imgur.com/c8rQD.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/c8rQD.png" alt="enter image description here" /></a></p>
  <p><a href="https://i.stack.imgur.com/uZPte.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/uZPte.png" alt="enter image description here" /></a></p>
  <p><a href="https://i.stack.imgur.com/fSKv2.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/fSKv2.png" alt="enter image description here" /></a></p>
  <p>Update2: I tried to revert with command line and got this message</p>
  <pre><code>MacBook:trutit vanvan$ git revert 69638b3
  error: could not revert 69638b3... Revert &quot;add grid system&quot;
  hint: after resolving the conflicts, mark the corrected paths
  hint: with 'git add &lt;paths&gt;' or 'git rm &lt;paths&gt;'
  hint: and commit the result with 'git commit'
  </code></pre>