title: Messed up git merge
body: <p>So I have a git repo which has the structure:</p>
  
  <pre><code> .DS_Store
   .git
   .gitignore
   README.md
   folder1/
   folder2/
  </code></pre>
  
  <p><code>folder1</code> is what I work on, need not bother about <code>folder2</code>. I branch of master and start working on the files in <code>folder1</code>. Another developer also works on files in <code>folder1</code>. He then goes ahead and merges his changes. Now it my turn to merge my changes. My typical <code>git merge</code> workflow looks like:</p>
  
  <pre><code>git fetch
  git rebase -i origin/master
  squash commits
  git push -f my_branch
  </code></pre>
  
  <p>However in this case, I went ahead and did a git pull in my branch which raised some conflicts. Using <code>git diff</code> I resolved the conflicts. Continuing like an idiot I then did <code>git commit -a</code> which showed up files from <code>folder2</code> as modified files in the commit screen. I aborted the commit since I realized something was off. Instead of the usualu "No commit message entered, commit aborted" message I got this : <code>Merge branch 'master' of https://github.com/comapny/my_repo into my_branch</code>. Instead of rebasing my branch on top on master I think I rebased master onto my branch. A <code>git log</code> shows up like this:</p>
  
  <pre><code>ME:
      Merge branch 'master' of https://github.com/company/my_repo into my branch
  ME:
      final commit on my_branch
  Other dev:
      His merge
  Other dev:
      His merge
  Other dev:
      His merge
  Other dev:
      His merge
  Other dev:
      His merge
  ME:
      2nd commit on my_branch
  ME:
      1st commit on my_branch
  </code></pre>
  
  <p>I am really unsure as to what has happened and Id would be great if someone can tell me what I screwed up. I dont even know what to google for.</p>
  
  <p>P.S. - when I visit my <code>repo</code> on github.com the master is untouched, my branch has the last commit as <code>final commit on my_branch</code> so Ive just messed up locally</p>