From 0cdbbf6d8400ab6b0f95cd43a177921e13081be8 Mon Sep 17 00:00:00 2001 From: alexander-l-stone Date: Thu, 11 Oct 2018 15:44:38 -0700 Subject: [PATCH 1/2] updated doc/README.rst with more modern git flow procedure. --- doc/README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/README.rst b/doc/README.rst index 12950d323f5d3..426e9b9ed0160 100644 --- a/doc/README.rst +++ b/doc/README.rst @@ -108,8 +108,9 @@ the pandas code and git, see `the developer pages When you start to work on some docs, be sure to update your code to the latest development version ('master'):: + git remote add upstream https://github.com/pandas-dev/pandas.git git fetch upstream - git rebase upstream/master + git pull upstream master Often it will be necessary to rebuild the C extension after updating:: From 4df506cfa0450e09b26cae791de890079a1afa68 Mon Sep 17 00:00:00 2001 From: alexander-l-stone Date: Thu, 11 Oct 2018 15:51:08 -0700 Subject: [PATCH 2/2] changed pull to merge. --- doc/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.rst b/doc/README.rst index 426e9b9ed0160..25762ef9019eb 100644 --- a/doc/README.rst +++ b/doc/README.rst @@ -110,7 +110,7 @@ development version ('master'):: git remote add upstream https://github.com/pandas-dev/pandas.git git fetch upstream - git pull upstream master + git merge upstream/master Often it will be necessary to rebuild the C extension after updating::