<p></p>
<p dir="auto">No, that's not what I meant. A "fixup commit" is a commit that's added to a pull request that fixes problems with code introduced in the same pull request.</p>
<p dir="auto">From CONTRIBUTING.md (emphasis added)</p>
<blockquote>
<p dir="auto">Avoid including "fixup" commits. If you have added a fixup commit (for example to fix a rubocop warning, or <strong>because you changed your own new code</strong>) please combine the fixup commit into the commit that introduced the problem. <code class="notranslate">git rebase -i</code> is very useful for this.</p>
</blockquote>
<p dir="auto">In this PR, the first commit includes:</p>
<div class="highlight highlight-source-diff" dir="auto"><pre class="notranslate"><span class="pl-mi1"><span class="pl-mi1">+</span>    rescue ActiveRecord::RecordNotUnique</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>     head :conflict</span></pre></div>
<p dir="auto">The third commit includes</p>
<div class="highlight highlight-source-diff" dir="auto"><pre class="notranslate">   rescue ActiveRecord::RecordNotUnique
<span class="pl-md"><span class="pl-md">-</span>      head :conflict</span>
<span class="pl-mi1"><span class="pl-mi1">+</span>      report_error "You are already subscribed to note #{note_id}.", :conflict</span></pre></div>
<p dir="auto">Since the <code class="notranslate">head :conflict</code> is added and then removed, the PR should be rebased so that that code isn't mentioned in the history (for example, when using <code class="notranslate">git blame</code>.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/5314#issuecomment-2489151008">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLPB3MRMIRS3NCEBSW32BS7TZAVCNFSM6AAAAABRVEQ2BGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOBZGE2TCMBQHA">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLNJC2QEK6T3SBAELET2BS7TZA5CNFSM6AAAAABRVEQ2BGWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTUULVXCA.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/5314/c2489151008</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/5314#issuecomment-2489151008",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/5314#issuecomment-2489151008",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>