What is the best way to resolve git conflicts after reformatting entire python code base with black?

Viewed 271

Suppose there is a large project not adhering to a specific python formatting standard, and you want to reformat all the python code using the python formatter black, and suppose the large scale project is pretty big (let's say ~2,000 python files), and ~30 people working on said project, each working on multiple features on multiple branches. Also there could be different semi-frozen "master" branches, that are occasionally merged with the newer code.

Using black on the entire code base would cause super conflicts with any open branch... How would you go about doing this process and minimizing conflicts?

0 Answers
Related