From 9fa3783c014010743a1e7b89654c0c73363c05ac Mon Sep 17 00:00:00 2001 From: Maximilian Roos Date: Sat, 18 Jan 2020 00:58:23 -0500 Subject: [PATCH] remove PR pre-black instructions --- doc/contributing.rst | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/doc/contributing.rst b/doc/contributing.rst index 3cd0b3e8868..808281fea69 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -384,21 +384,6 @@ from the root of the Xarray repository. Now ``black`` and ``flake8`` will be run each time you commit changes. You can skip these checks with ``git commit --no-verify``. -.. note:: - - If you were working on a branch *prior* to the code being reformatted with black, - you will likely face some merge conflicts. These steps can eliminate many of those - conflicts. Because they have had limited testing, please reach out to the core devs - on your pull request if you face any issues, and we'll help with the merge: - - - Merge the commit on master prior to the ``black`` commit into your branch - ``git merge f172c673``. If you have conflicts here, resolve and commit. - - Apply ``black .`` to your branch and commit ``git commit -am "black"`` - - Apply a patch of other changes we made on that commit: ``curl https://gist.githubusercontent.com/max-sixty/3cceb8472ed4ea806353999ca43aed52/raw/03cbee4e386156bddb61acaa250c0bfc726f596d/xarray%2520black%2520diff | git apply -`` - - Commit (``git commit -am "black2"``) - - Merge master at the ``black`` commit, resolving in favor of 'our' changes: - ``git merge d089df38 -X ours``. You shouldn't have any merge conflicts - - Merge current master ``git merge master``; resolve and commit any conflicts Backwards Compatibility ~~~~~~~~~~~~~~~~~~~~~~~