- Fork our monorepo
- Create your branch
git branch branch-name
-
Make desired changes in code and follow commit message guidelines
-
Push to your fork
git push
- Before creating the PR you have to update the branch on current master:
git fetch
git rebase origin/master
- You have to check your change using the command
php phing standards tests tests-acceptanceas it’s mentioned in contributing. - Please make sure you sign form to agree with the license agreement.
- Create a PR with essential information to make our code review easier.
- you do not have to update
CHANGELOG.mdat all as it is generated automatically using symplify/changelog-linker during our release process.
- you do not have to update
- Now just wait for review of your change.
During the review, reviewer will write comments how to improve the solution or fix bugs. CR can end in Approved or RequestChanges status when further edits are needed. After completing the CR, it is necessary to correct to correct errors encountered by the reviewer.
It would be good if you could respond to each comment so that we knew you were reading them.
We use fixup commits for correcting pull request so the reviewer can see what edits were made. Once the changes are done, the branch must be pushed. Comments to commit message should be corrected after the fixup commit squash.
- Changes which you want to add to previous commits commit independently with
git commit --fixup=hash. Commit messages will be automatically completed.
If the reviewer is satisfied with changes, squash fixup commits.
- Update the branch on current master:
git fetch
git rebase origin/master
- Squash fixup commits:
git rebase --interactive --autosquash origin/master
After squash you just need to correct commit messages (if needed) and push it:
git push --force