From e2fabe56b7618e00d722baf2c2be51c8b7120b15 Mon Sep 17 00:00:00 2001 From: chance garcia Date: Fri, 1 Jul 2016 21:43:50 -0400 Subject: [PATCH] Encountered an error when following the steps for contribution. Updated the contribution overview to reflect how to avoid that error when transitioning between steps 3 and 4 in `Your First Documentation Contribution` --- contributing/documentation/overview.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index 0f663dddd98..2334c9b3fce 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -107,6 +107,12 @@ your project: upstream https://github.com/symfony/symfony-docs.git (fetch) upstream https://github.com/symfony/symfony-docs.git (push) +Fetch all the commits of the upstream branches by executing this command: + +.. code-block:: bash + + $ git fetch upstream + The purpose of this step is to allow you work simultaneously on the official Symfony repository and on your own fork. You'll see this in action in a moment. @@ -208,6 +214,7 @@ contribution to the Symfony docs: # create a new branch based on the oldest maintained version $ cd projects/symfony-docs/ + $ git fetch upstream $ git checkout -b my_changes upstream/2.7 # ... do your changes