OK so the instructions for dealing with the black ...
# generalh
happy-kitchen-89482
10/07/2019, 4:39 PMOK 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 PMI 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::hundreds-father-404
10/07/2019, 5:39 PMDid 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-v2f
fancy-motherboard-24956
10/07/2019, 5:50 PMI’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 PMah, ok. yea, this sounds like it should be reverted then.
f
fancy-motherboard-24956
10/07/2019, 5:50 PMThat’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 PMer, let's continue in the other thread.
➕ 1
h
hundreds-father-404
10/07/2019, 6:21 PMOh huh think instructions can actually just be:
run ./pants fmt-v2w
witty-crayon-22786
10/07/2019, 6:50 PMI don't think that that will work for a rebase. Maybe for a merge.
h
hundreds-father-404
10/07/2019, 6:51 PMAgreed, my point is to avoid a rebase. Rebase seems much more difficult to pull off
w
witty-crayon-22786
10/07/2019, 6:52 PMmm
3 Views