-
Notifications
You must be signed in to change notification settings - Fork 148
Updates and adds missing documents #267
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@ptejada Thank you for the awesome work! Could you move your branch ahead release-1.0 instead of master please?
It doesn't matter. I merged your changes manually. Thanks!
Thank you. I am curious why you can't just merge the PR? When creating the PR it says whether it can be merged without any conflicts or not and there weren't any conflicts.
Because I should first merge your branch into release-1.0 and next release-1.0 into master.
@ptejada I had little time yesterday so I did not write a detailed explanation.
Now stable version is 1.0, which is located in the release-1.0 branch. And master branch is the future version 1.1. And the changes should merge consistently into all branches starting from the smaller version to the larger version.
For example, if we have branches: master (future 2.0 release), release-1.1 (releases 1.1.0, 1.1.1 etc.) and release 1.0, and we have a bugfix (feature) that is relevant for release 1.1, then we need to merge bugfix into a release-1.1 branch, then release-1.1 into master branch.
See Symfony git log, for example. There you can clearly see how the changes merge into all parallel releases sequentially in one direction.
Released with 1.0.4.
Contribution type
Documentation update
Description of the change
Updates links in the documentation, wording and adds missing documents.