@@ -190,11 +190,12 @@ Finalizing pull requests
190190Once you have code, documentation and tests ready, it is time to
191191finalize the pull request.
192192
193- CHANGES.rst
194- ~~~~~~~~~~~
193+ Acknowledgments
194+ ~~~~~~~~~~~~~~~
195195
196196If you have done any non-trivial change and would like to be credited,
197- add yourself to `CHANGES.rst `_ file.
197+ remind us to add `acknowledge ` tag to the issue. This way we will add
198+ your name to the release notes, when next release is made.
198199
199200Resolving conflicts
200201~~~~~~~~~~~~~~~~~~~
@@ -203,9 +204,6 @@ Conflicts can occur if there are new changes to the master that touch
203204the same code as your changes. In that case you should
204205`sync your fork `_ and `resolve conflicts `_ to allow for an easy merge.
205206
206- The most common conflicting file is the aforementioned
207- `CHANGES.rst `_, but luckily fixing those conflicts is typically easy.
208-
209207.. _SeleniumLibrary project : https://github.com/robotframework/SeleniumLibrary
210208.. _robotframework-users : http://groups.google.com/group/robotframework-users
211209.. _issue tracker : https://github.com/robotframework/SeleniumLibrary/issues
@@ -222,6 +220,5 @@ The most common conflicting file is the aforementioned
222220.. _invoke : http://www.pyinvoke.org/
223221.. _Travis CI : https://travis-ci.org/robotframework/SeleniumLibrary
224222.. _test/README.rst` : https://github.com/robotframework/SeleniumLibrary/blob/master/test/README.rst
225- .. _CHANGES.rst : https://github.com/robotframework/SeleniumLibrary/blob/master/CHANGES.rst
226223.. _sync your fork : https://help.github.com/articles/syncing-a-fork/
227224.. _resolve conflicts : https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line
0 commit comments