Updated releasing.md

jgebal · jgebal · commit 46aa44300d42 · 2019-06-18T23:19:12.000+01:00
diff --git a/development/releasing.md b/development/releasing.md
@@ -7,18 +7,20 @@ To create a release:
    - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z`
    - update, commit and push at least one file change in the release branch, to kickoff a Travis build
    - wait for th build to complete successfully
-   - merge the release branch to master and wait for master build to complete successfully
-   - create a release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release.
+   - merge the release branch to master and wait for master build to complete successfully  (do not use Squash/rebase for merge operation)
+   - create a Github release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release.
    To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). 
    Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+)
-   - After release was successfully built, merge master branch back into develop branch
+   - After A build was completed on a TAG (github release) was successful, merge master branch back into develop branch.
+   - At this point, master branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. 
    - After develop branch was built, update version number in `VERSION` file to represent next planned release version.
    - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly.
 
 The following will happen:
    - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name
    - changes to those two files are committed and pushed back to release branch by Travis
-   - when a release is created, a new tag is added in on the repository and a tag build is executed
+   - builds on master branch are **not getting executed**
+   - when a Github release is created, a new tag is added in on the repository and a tag build is executed
    - the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag.
 
 Note:
