[PATCH] D150782: [NFC][Py Reformat] Reformat python files in mlir subdir
Mehdi AMINI via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri May 19 01:01:31 PDT 2023
mehdi_amini added a comment.
> Reformatting is done with black.
Can you make it more clear by providing the exact invocation?
> If you end up having problems merging this commit because you
have made changes to a python file, the best way to handle that
is to run git checkout --ours <yourfile> and then reformat it
with black.
`ours` and `theirs` are reversed in a rebase: anyone who has on-going work and rebase on main will lose their work with `git checkout --ours` when encountering a conflict during a rebase, wouldn't they?
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D150782/new/
https://reviews.llvm.org/D150782
More information about the llvm-commits
mailing list