https://pantsbuild.org/ logo
#general
Title
# general
h

happy-kitchen-89482

10/07/2019, 4:39 PM
OK so the instructions for dealing with the black merge conflicts are not working for me. There appear to be major issues around docstring indentation.
h

hundreds-father-404

10/07/2019, 5:03 PM
I think this would work instead: git pull origin master Upon merge conflict, accept all of your original versions, then run
./pants fmt-v2 src/python:: tests/python::
Did these instructions work? I did a similar flow for one of my PRs. The main thing I did was accepting my current version and ignoring the Black changes, then regenerating the Black changes myself with
./pants fmt-v2
f

fancy-motherboard-24956

10/07/2019, 5:50 PM
I’m not sure this works because I’m not sure black will always manage to reformat the mixed indentation that accepting your side of the conflict resolution incurs
w

witty-crayon-22786

10/07/2019, 5:50 PM
ah, ok. yea, this sounds like it should be reverted then.
f

fancy-motherboard-24956

10/07/2019, 5:50 PM
That’s one thing I was trying to fix with my multi-steps instructions, but they’re broken too for another reason
w

witty-crayon-22786

10/07/2019, 5:51 PM
er, let's continue in the other thread.
1
h

hundreds-father-404

10/07/2019, 6:21 PM
Oh huh think instructions can actually just be:
run ./pants fmt-v2
as a new commit. No need to merge master or rebase. That should resolve any merge conflicts, unless I’m missing something
w

witty-crayon-22786

10/07/2019, 6:50 PM
I don't think that that will work for a rebase. Maybe for a merge.
h

hundreds-father-404

10/07/2019, 6:51 PM
Agreed, my point is to avoid a rebase. Rebase seems much more difficult to pull off
w

witty-crayon-22786

10/07/2019, 6:52 PM
mm
3 Views