Hey guys, So I was doing an interactive rebase and when I continued after fixing a conflict, I got: error: Ref refs/heads/master is at 13c56aa5628c03953912a683136f38cad852471b but expected 25713c34497cf07e4476291e6cd720d8a667701c fatal: Cannot lock the ref 'refs/heads/master'. When I do a git status, I get: # On branch master # Your branch and 'origin/master' have diverged, # and have 6 and 5 different commit(s) each, respectively. # nothing to commit (working directory clean) Any ideas on what to do next to try and get my branch back in order? Thanks! Rick -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html