<p><a href="https://github.com/skif-off" class="user-mention">@Skif-off</a> yeah for git the console is better.</p>
<p>What I understand <a href="https://github.com/frlan" class="user-mention">@frlan</a>' is asking is for you to do a <a href="https://git-scm.com/docs/git-rebase" rel="nofollow">git rebase</a> against the master branch to combine the two commits together and hopefully make the merge you did in your branch disappear (lesson: only ever pull Geany master into your master, not your branch).</p>
<p><code>git rebase --interactive</code> makes it easier.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany-plugins/pull/653#issuecomment-360919866">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJ-VVp9djPIoOcaxkZE5dqbo3G-krks5tOk8MgaJpZM4QwLmL">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ-chuSBoRniRC-DspqW98rwi_z9aks5tOk8MgaJpZM4QwLmL.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany-plugins/pull/653#issuecomment-360919866"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/geany/geany-plugins","title":"geany/geany-plugins","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany-plugins"}},"updates":{"snippets":[{"icon":"PERSON","message":"@elextr in #653: @Skif-off yeah for git the console is better.\r\n\r\nWhat I understand @frlan' is asking is for you to do a [git rebase](https://git-scm.com/docs/git-rebase) against the master branch to combine the two commits together and hopefully make the merge you did in your branch disappear (lesson: only ever pull Geany master into your master, not your branch).\r\n\r\n`git rebase --interactive` makes it easier."}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany-plugins/pull/653#issuecomment-360919866"}}}</script>