[clang] [analyzer] Move alpha checker EnumCastOutOfRange to optin (PR #67157)

Balazs Benics via cfe-commits cfe-commits at lists.llvm.org
Tue Dec 5 08:40:26 PST 2023


=?utf-8?q?DonĂ¡t?= Nagy <donat.nagy at ericsson.com>
Message-ID:
In-Reply-To: <llvm.org/llvm/llvm-project/pull/67157 at github.com>


steakhal wrote:

> (Force pushed the branch because I wanted to rebase it onto a recent main and fix the merge conflicts. Is there a better workflow than this?)

I think git also offers conflict resolution for `git merge origin/main`. It should put the resolution into the merge commit.
That being said, I usually just do the rebase/resolve approach and force-push; only after all conversations are resolved and I don't expect anyone reviewing at the time. But yea, a merge commit should be the way for GitHub AFAIK.

https://github.com/llvm/llvm-project/pull/67157


More information about the cfe-commits mailing list