topperc wrote:

> > Please do not force push in PRs without a good reason. 
> > https://llvm.org/docs/GitHub.html#rebasing-pull-requests-and-force-pushes
> 
> Hi @topperc , the web page mentions: `"After your PR is reviewed and 
> accepted, you want to rebase your branch to ensure you won’t encounter merge 
> conflicts when landing the PR."` Should I now rebase locally, then force 
> push, and finally merge?

I'm not sure why that says "rebase". A merge commit with `main` should be fine. 
The PR will be squashed anyway.

https://github.com/llvm/llvm-project/pull/173988
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to