https://github.com/michaelmaitland resolved
https://github.com/llvm/llvm-project/pull/65535
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
michaelmaitland wrote:
> Is there a way to fix this now?
I think you can drop the merge commit using `git rebase -i`. You may have to
pass `--rebase-merges` to have the ability to drop the merge commit. Then you
can pull upstream and `git rebase upstream/main`.
michaelmaitland wrote:
> [Merge branch 'llvm:main' into
> mgudim_veyron_def](https://github.com/llvm/llvm-project/pull/65535/commits/454b41eea50a3583ab5c29bffbd46bcd633b)
The [LLVM GitHub User Guide](https://llvm.org/docs//GitHub.html) recommends to
rebase on main instead of merge main.
https://github.com/mgudim updated
https://github.com/llvm/llvm-project/pull/65535
>From d1ba27988840703b9a7a12ad48ecfb282752e7e2 Mon Sep 17 00:00:00 2001
From: Mikhail Gudim
Date: Wed, 6 Sep 2023 17:15:56 -0400
Subject: [PATCH 1/2] [RISCV] Added definition of Ventana veyron-v1 processor.
---
