martong added a comment.

In D106102#3028584 <https://reviews.llvm.org/D106102#3028584>, @manas wrote:

> The pre-merge checks fail due to the patch being unable to get applied. The 
> troubleshooting 
> <https://buildkite.com/llvm-project/diff-checks/builds/65987#annotation-patch_diff>
>  suggest to update the patch via `arc diff ```git merge-base HEAD origin``` 
> --update D106102` and it would include all local changes into that patch. 
> Shouldn't I avoid including all local changes, as some local changes are 
> still WIP?

I guess `HEAD` should refer to the commit that represents this patch, in this 
case that is `ce82443c69be`. And I believe you local changes that are not 
committed should not affect `arc diff` at all. But, as a precaution, you could 
first stash your local changes before calling `arc`. Hope this helps.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D106102/new/

https://reviews.llvm.org/D106102

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to