Hacking:Making pull requests: Difference between revisions
Content added Content deleted
No edit summary |
|||
| Line 19: | Line 19: | ||
* Each commit should be small as possible and contain one logical step of developing a feature. This will help us better understand your code. Sometimes we see changes per each commit separately. |
* Each commit should be small as possible and contain one logical step of developing a feature. This will help us better understand your code. Sometimes we see changes per each commit separately. |
||
* Compiler should successfully build each commit you made. |
* Compiler should successfully build each commit you made. |
||
* Make all your commits in feature branch. This mean all your changes in your local repository will be only in feature branch |
* Make all your commits in '''feature''' branch. This mean all your changes in your local repository will be only in '''feature''' branch. |
||
* Don't forget each day sync your repository |
* Don't forget each day sync your repository with ours and merge new code in '''develop''' branch -> to your '''feature''' branch. Fix all merge conflicts. |
||
* You can push your feature branch to bitbucket. This will help us watch your progress and leave comments. We recommend don't hide your code until the end. |
* You can push your '''feature''' branch to bitbucket. This will help us watch your progress and leave comments. We recommend don't hide your code until the end. |
||
* When you will decide that all were done create a pull request. In settings set to merge your '''feature''' branch with our '''develop''' or '''release''' branch. See which branch is parent for your branch. |
|||
* If we ask you to fix some issues related to your changes continue commit them to the '''feature''' branch and push them to bitbucket. It will automatically update your pull request. |
|||
== General recommendations == |
== General recommendations == |
||