Encountered an error when following the steps for contribution #6704
Conversation
|
👍 Looks indeed like this is missing. Maybe we can remove the command output, I don't think it's very usefull and it'll be outdated as soon as we add new branches (and takes much space). This can be done while merging, but feel free to update this PR if you have time. Status: reviewed |
|
👍 |
chancegarcia
force-pushed
the
update_contribution_overview
branch
from
55d00d8 to
493d54b
Compare
|
removed the command output and squashed my history down so all my changes are in a single commit. |
|
@chancegarcia looks like something went wrong with squashing (seems like you squashed on master or so). can you please rebase against 2.7? |
chancegarcia
force-pushed
the
update_contribution_overview
branch
from
493d54b to
a8c589e
Compare
|
ran |
|
Looking perfect now. Thanks for your quick responses! |
| @@ -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 the upstream branch list. | |||
There was a problem hiding this comment.
In Step 4 we use directly the upstream/ to create the branch:
$ git checkout -b improve_install_chapter upstream/2.7
My question: is really mandatory to execute git fetch upstream first?
In case it's mandatory, I propose to reword Fetch the upstream branch list. a bit to explain what's happening. For example:
Fetch all the commits of the upstream branches executing
this command:
There was a problem hiding this comment.
@javiereguiluz Adding a new remote does not fetch anything. Thus, the checkout command results in an error like this:
fatal: Cannot update paths and switch to branch 'improve_install_chapter' at the same time.
Did you intend to checkout 'upstream/2.7' which can not be resolved as commit?
There was a problem hiding this comment.
And yeah, I agree with your rewording suggestion.
There was a problem hiding this comment.
K. I'll reword and commit. Should I also squash the reword commit together
with the original?
On Monday, July 4, 2016, Christian Flothmann notifications@github.com
wrote:
In contributing/documentation/overview.rst
#6704 (comment):@@ -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 the upstream branch list.
And yeah, I agree with your rewording suggestion.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
https://github.com/symfony/symfony-docs/pull/6704/files/a8c589e3716b9a53afd065b1c88eeaab466fa781#r69479011,
or mute the thread
https://github.com/notifications/unsubscribe/AAVQZwdCKcN950V3I6Wj43bZt5kx4SJWks5qSTgtgaJpZM4JDk6s
.
-- Chance
email: chance@chancegarcia.com
portfolio: http://chancegarcia.com/resume/portfolio
There was a problem hiding this comment.
@chancegarcia You can do that if you like to. But that's not necessary as we also can just do that while merging your PR. :)
chancegarcia
force-pushed
the
update_contribution_overview
branch
from
a8c589e to
9a9a332
Compare
…ed the contribution overview to reflect how to avoid that error when transitioning between steps 3 and 4 in `Your First Documentation Contribution`
chancegarcia
force-pushed
the
update_contribution_overview
branch
from
9a9a332 to
e2fabe5
Compare
|
Thank you for fixing this guide @chancegarcia! |
…ion (chancegarcia) This PR was merged into the 2.7 branch. Discussion ---------- Encountered an error when following the steps for contribution 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`. Commits ------- e2fabe5 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`
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.