-
|
I now have many conflicts in my PR due to black being applied on the main branch #18948. What should I do ? |
Beta Was this translation helpful? Give feedback.
Answered by
jjerphan
Jun 21, 2021
Replies: 1 comment 1 reply
-
|
This has been answered by @ogrisel in #20301 (comment). |
Beta Was this translation helpful? Give feedback.
1 reply
-
|
Note that the proposed solution does not always work... See the discussion in the comments. |
Beta Was this translation helpful? Give feedback.
Answer selected by
lesteve
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
This has been answered by @ogrisel in #20301 (comment).