SourceTree

Committing Changes

After having all changes completed in local dev branch (PSPayrollRushDev), open SourceTree,

Stage the files that need to be pushed

Verify the changes on the right side:

When providing the commit message, make sure to mention the Jira ticket and select the "Push changes immediately to origin/<YOUR REMOTE BRANCH NAME>"

After committing, click on Log / History tab:

Click on the most recent commit and you will notice that the file(s) you committed show separately with respect to other commits:

Bamboo

Updating the Release Number

1.  Next, go to Bamboo and login
   
   
   
2.  Click on Deploy menu and select "All Deployment Projects"
   
   
   
   
3.  Scroll down to your project and for the deployment environment, click on the pencil icon: 
   
   
   
   
4. Click on Release Versioning tab
   
   
   

5.  If releasing to TEST, make sure to amend/edit the "rc" (release candidate) number and decrement the minor revision number:

   BEFORE	AFTER

6.  Finally, copy the whole version string (pspayroll_rc02-v3.11, in my case as shown above) and click on "Save" button
   
   

Stash

Creating a Tag

1.  Next, go to Stash and login
   
   
   
2.  Click on Repositories and select your repository
   
   
   
3.  Under Source dropdown list, change to your own branch (where you committed your change through SourceTree)
   
   
   
   
4.  Click on "Commits" and then select the commit for which you would like to create a tag for
   
   
   
   
5.  Click on Tag this commit" on the right
   
   
   
   
6.  Provide the tag name that was copied from Bamboo along with a brief description and then click on "Create tag"
   
   
   
   
7.  Click on Tags on the left and you can verify the newly created tag
   
   
   
   

Merge from your branch to TEST branch

1.  Click on "Create pull request" on the left
   
   
   
   

2.  Select the appropriate branch FROM and TO---

   1. If releasing to TEST

      BEFORE

      AFTER

      Verify the commits... these are the changes that will be merging in the TEST environment  Click on Continue  Provide a description (optional) and then click on "Create"  On the resulting page, click on "Merge" button  Finally, you will get a modal confirmation... click on Merge to complete the process CAUTION DO NOT Select "Delete..." checkbox/option... otherwise, you will lose your dev (own) branch and will have to re-create!

You can now go back to Bamboo and verify that it built and deployed correctly... 

Build:

Deploy:

Change Log

Amend the Change Log to reflect the updates