title: Git is not showing any conflicts, and is overwriting my local copy
body: <p>My routine on git has always been very simple:</p>
  
  <pre><code>git add -A
  git commit -m 'the changes I made'
  git pull
  # resolve conflicts
  git push
  </code></pre>
  
  <p>However, for some unknown reasons, despite lots of conflicts with the origin, after pulling, I don't get any conflicts and without my permission it force updates my local copy. Something along these lines: '2 files changed, 2 insertions(+), 6 deletions(-)'. But in my case, conflicts shouldn't be resolved from simple merge and should require manual conflict resolution from my side. Why is git not letting me to do the manual conflict resolution? Thanks in advance!
  note: none of my git commands have force option -f</p>