[clang-tools-extra] [clang-tidy] Create bugprone-incorrect-enable-shared-from-this check (PR #102299)

Julian Schmidt via cfe-commits cfe-commits at lists.llvm.org
Mon Oct 28 14:27:17 PDT 2024


https://github.com/5chmidti commented:

> next time I shouldn't rebase and just wait to fix the conflict on merge

PRs that are quite outdated should, and those that have conflicts must be updated before the PR is merged. You can either rebase with upstream changes, or merge with upstream. Which one you chose is up to you, but merging seems to be less likely to cause issues with commits that are not yours from appearing in the PR. E.g., right now there is a conflict on the release notes. You could use the GitHub UI to fix the conflict, or use your local git by fetching from the remote, and either using `git rebase origin/main` or `git merge origin/main`

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


More information about the cfe-commits mailing list