minglotus-6 wrote:

> > Whoops! Sorry! Please don't review this.
> > Something goes wrong with my fixup.
> 
> Let me know when it is ready for review.

Thanks! This is ready for review now.

* I tried to merge the [nfc](https://github.com/llvm/llvm-project/pull/81054) 
such that the diff of this PR doesn't show the NFC diff. I *think* what I did 
wrong is to run `git merge main` on the source branch 
`users/minglotus-6/spr/instrprof` of this PR, that way the fixup commit caused 
the mess. 
* I ended up fixing by running `git checkout <base-branch>` from remote, and 
then `git checkout -b <new-branch>` and apply the intended diff in 
`<new-branch>`. However this comes with a force push which overwrite the commit 
history in the PR. Not 100% sure but I *think* I should create 
`<source-branch>` on top of `<base-branch>` rather than from `<main>` in the 
first place  in order to preserve commit history in the future.

https://github.com/llvm/llvm-project/pull/81051
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

Reply via email to