<html>
<head>
<base href="https://bugs.llvm.org/">
</head>
<body><span class="vcard"><a class="email" href="mailto:rnk@google.com" title="Reid Kleckner <rnk@google.com>"> <span class="fn">Reid Kleckner</span></a>
</span> changed
<a class="bz_bug_link
bz_status_RESOLVED bz_closed"
title="RESOLVED FIXED - Please merge fc69ad09882c into 9.0.1 to workaround for PR43479 and PR43695"
href="https://bugs.llvm.org/show_bug.cgi?id=43807">bug 43807</a>
<br>
<table border="1" cellspacing="0" cellpadding="8">
<tr>
<th>What</th>
<th>Removed</th>
<th>Added</th>
</tr>
<tr>
<td style="text-align:right;">Status</td>
<td>CONFIRMED
</td>
<td>RESOLVED
</td>
</tr>
<tr>
<td style="text-align:right;">Resolution</td>
<td>---
</td>
<td>FIXED
</td>
</tr></table>
<p>
<div>
<b><a class="bz_bug_link
bz_status_RESOLVED bz_closed"
title="RESOLVED FIXED - Please merge fc69ad09882c into 9.0.1 to workaround for PR43479 and PR43695"
href="https://bugs.llvm.org/show_bug.cgi?id=43807#c3">Comment # 3</a>
on <a class="bz_bug_link
bz_status_RESOLVED bz_closed"
title="RESOLVED FIXED - Please merge fc69ad09882c into 9.0.1 to workaround for PR43479 and PR43695"
href="https://bugs.llvm.org/show_bug.cgi?id=43807">bug 43807</a>
from <span class="vcard"><a class="email" href="mailto:rnk@google.com" title="Reid Kleckner <rnk@google.com>"> <span class="fn">Reid Kleckner</span></a>
</span></b>
<pre>(In reply to Tom Stellard from <a href="show_bug.cgi?id=43807#c2">comment #2</a>)
<span class="quote">> (In reply to Reid Kleckner from <a href="show_bug.cgi?id=43807#c1">comment #1</a>)
> > I tried to do this, but the branch seems to be protected. Tom, I guess we
> > need new processes for doing these merges.
>
> I just dropped the protections, you should be able to commit now. Can you
> backport using `git cherry-pick -x`.</span >
Thanks, I did that and pushed:
<a href="https://github.com/llvm/llvm-project/commit/a4b77f5ffb167fb2d41ec5c14f8ace6d4f5832bf">https://github.com/llvm/llvm-project/commit/a4b77f5ffb167fb2d41ec5c14f8ace6d4f5832bf</a>
I spent a while looking at the "merge-git.sh" script, but it sounds like `git
cherry-pick -x` will be the process going forward.</pre>
</div>
</p>
<hr>
<span>You are receiving this mail because:</span>
<ul>
<li>You are on the CC list for the bug.</li>
</ul>
</body>
</html>