title: How many types of branches exist in git?
body: <p>Struggling to understand how to work with remote branches and how many types of git branches there are I somehow got lost in differing namings and git versions. Here's a few things that happened to me, while believing there are only TWO types of git branches: </p>
  
  <ol>
  <li>I unwillingly created a non-tracking local branch (so push and pull didn't work)</li>
  <li>(I therefore decided to abandon automatic push/pull for a while)</li>
  <li>I merged origin/master into my current branch without having fetched from origin before</li>
  <li>I merged master into my current branch without having merged origin/master into it first. </li>
  </ol>
  
  <p>So, after having spent some time mainly at <a href="http://git-scm.com/book" rel="nofollow noreferrer">http://git-scm.com/book</a> and on stackoverflow, I got to the conclusion that I can actually describe FOUR instead of the commonly described two types (local vs remote) of git branches. I decided I would try to draw my understanding of how to work with remote branches, I know it is extremely reduced, but the idea would be to point in the right direction and get an idea of the different branch levels: </p>
  
  <p><strong>Edit:</strong> New picture, incorporating dunni's comment.
  <img src="https://i.stack.imgur.com/8WMyq.png" alt="enter image description here"></p>
  
  <p>What do you think, how much did I get wrong? What should be added/noted?</p>