Added a guide for Symfony Docs maintainers #11161
Conversation
| # make sure that your local branch is updated | ||
| $ git checkout 3.4 | ||
| $ git fetch upstream | ||
| $ git merge upstream/3.4 |
There was a problem hiding this comment.
Not needed, gh takes care of this
| $ git add components/phpunit_bridge.rst | ||
| $ git commit -a | ||
| $ git push origin | ||
| $ git push upstream |
There was a problem hiding this comment.
If it's during a merge with gh, just re-run gh. It knows it stopped in a merge conflict and continues finishing it's merge proces
There was a problem hiding this comment.
Such an excellent guide @javiereguiluz! I only have one minor remark for now.
|
I always read this article but will do in detail again, later today 👍🏻 |
|
@javiereguiluz why is this file in the |
|
@OskarStark the article has been created in |
|
Thank you all for the reviews. I've made most (but not all) of the requested changes ... and I've merged it to move forward. We can fix and tweak further things later. |
This is for maintainers of this repo, so it doesn't have interest for normal Symfony users.
@OskarStark as the newest doc maintainer, this guide is mainly for you. When you have some time, please read it and report any problem or confusing explanation.
@xabbuh @wouterj @HeahDude as expert maintainers, please check if I missed something important about merging PRs. Two comments: