Hacking:Making pull requests: Difference between revisions
Content deleted Content added
No edit summary |
|||
Line 32: | Line 32: | ||
** For regular patches (contains several commits) you should use the branch '''feature''' ('''recommended way'''). Don't worry if repository already contains one. We can have as many as we need (so called anonymous branches, [http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/ A Guide to Branching in Mercurial]). See [[Hacking:Tools#Mercurial|Mercurial useful commands]]. |
** For regular patches (contains several commits) you should use the branch '''feature''' ('''recommended way'''). Don't worry if repository already contains one. We can have as many as we need (so called anonymous branches, [http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/ A Guide to Branching in Mercurial]). See [[Hacking:Tools#Mercurial|Mercurial useful commands]]. |
||
* Add correct description for your pull request. It should contain string "Resolved (or Fixed) issue #XXX. <Text of an issue description>". Where XXX is a number of issue in the Issue Tracker. Read more about [https://confluence.atlassian.com/bitbucket/resolve-issues-automatically-when-users-push-code-221451126.html Resolving issues automatically when push code]. |
* Add correct description for your pull request. It should contain string "Resolved (or Fixed) issue #XXX. <Text of an issue description>". Where XXX is a number of issue in the Issue Tracker. Read more about [https://confluence.atlassian.com/bitbucket/resolve-issues-automatically-when-users-push-code-221451126.html Resolving issues automatically when push code]. |
||
* Don't forget to add your changes to file ChangeLog.txt. |
* Don't forget to add your changes to file ChangeLog.txt. But only if these changes brings new feature or fix a bug. For example fixing building of the source code is not enough reason to update a changelog. |
||
* In the end push your changes to your fork, then create a pull request. |
* In the end push your changes to your fork, then create a pull request. |
||
* In a pull request merge your '''develop'''/'''feature''' branch with our '''develop''' branch. |
* In a pull request merge your '''develop'''/'''feature''' branch with our '''develop''' branch. |