<p>yes, it very well might.  But you should be able to fix that fairly easily to fix: check master out, pull (fast-forward, <code>pull --ff-only</code>) from upstream, and rebase your branch on top of that.  Or you can also just <code>rebase -i 8234f7c^</code> and remove the two offending/duplicate commits, only keeping yours.  As it's a separate branch, there won't be no problem.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/geany/geany-plugins/pull/284#issuecomment-141795035">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ3Hv9decUqY54xcqB0XiC4_pmz9hks5ozsKTgaJpZM4F-upi.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/284#issuecomment-141795035"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>