[llvm-bugs] [Bug 43807] Please merge fc69ad09882c into 9.0.1 to workaround for PR43479 and PR43695

via llvm-bugs llvm-bugs at lists.llvm.org
Tue Oct 29 11:29:53 PDT 2019


https://bugs.llvm.org/show_bug.cgi?id=43807

Reid Kleckner <rnk at google.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|CONFIRMED                   |RESOLVED
         Resolution|---                         |FIXED

--- Comment #3 from Reid Kleckner <rnk at google.com> ---
(In reply to Tom Stellard from comment #2)
> (In reply to Reid Kleckner from comment #1)
> > 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`.

Thanks, I did that and pushed:
https://github.com/llvm/llvm-project/commit/a4b77f5ffb167fb2d41ec5c14f8ace6d4f5832bf

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.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-bugs/attachments/20191029/e21e256d/attachment.html>


More information about the llvm-bugs mailing list