{"thread":{"id":"18751","subject":"Ref refs/heads/master is at *** but expected ***","startedAt":"2009-04-06T18:11:40Z","lastAt":"2009-04-06T18:11:40Z","messageCount":1,"participants":["Rick Martinez"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"110612","messageId":"1fc2d7d00904061111s65ece9bal9a5c1288c631843b@mail.gmail.com","threadId":"18751","inReplyTo":null,"subject":"Ref refs/heads/master is at *** but expected ***","fromName":"Rick Martinez","fromEmail":"rick.martinez@gmail.com","sentAt":"2009-04-06T18:11:40Z","receivedAt":"2009-04-06T18:11:40Z","isPatch":false,"sender":{"key":"rick.martinez@gmail.com","avatar":null},"body":"Hey guys,\n\nSo I was doing an interactive rebase and when I continued after fixing\na conflict, I got:\n\nerror: Ref refs/heads/master is at\n13c56aa5628c03953912a683136f38cad852471b but expected\n25713c34497cf07e4476291e6cd720d8a667701c\nfatal: Cannot lock the ref 'refs/heads/master'.\n\nWhen I do a git status, I get:\n\n# On branch master\n# Your branch and 'origin/master' have diverged,\n# and have 6 and 5 different commit(s) each, respectively.\n#\nnothing to commit (working directory clean)\n\nAny ideas on what to do next to try and get my branch back in order?\n\nThanks!\nRick\n"}]}