title: How can I delete (or merge) a local Git branch that I'm currently on?
body: <p>I'm pretty new to using git, and I use it to contribute to the AOKP Android ROM. I've successfully created a few branches, modified the code, and uploaded the commits that have gotten merged on the remote end. But in my local repository, those branches are still showing up (even though they show up as having no changes). The problem is that when I created those branches, I did so right from the subfolder that needed to be modified, so I don't have any "higher" branches to go to. And because of that, I can't delete those branches -- git tels me <code>error: Cannot delete the branch 'MyMods' which you are currently on.</code></p>
  
  <p>So what can I do to get rid of those branches?</p>