Page Comparison

In some cases we might offer you a possibility to update code in our Git repository in order for all parties to have the same controlled environment for code and related file updates and changes. In order for us to retain control over the process we will create a special code branch that you will have write access to. After making the changes you will be able to ask us to include these changes in the main code base and deploy them.

Step-by-step guide

1. Follow these steps to set up Sourcetree and access to repository
2. Read about the theory behind usage of

   Status
   subtle true title master

    and 

   Status
   subtle true title develop

   branches as using an additional customer branch is an expansion of the same principle
3. In Sourcetree locate the 

   Status
   subtle true title customer-XXXX

    branch created for you under the Remotes section and double click it:
   
4. It will appear under the 

   Status
   subtle true title branches

    section in bold (make sure it is active/bold when about to update any files in the future as well):
   
5. Add/change the needed files to you git folder and you will see that there are changes in your workspace:
   
6.  When you click on the File status you will see the changed/added files listed in the Unstaged files section. You should select either all or some of them so that they appear in the Staged files section:
   
7. Enter a comment for this commit. If you can (preferably) allocate a specific JIRA issue - please mention that on the first line of commit message

8. Press Commit button

   Tip
   You can do this multiple times. I.e. you don't have to wait for the commit only when you are 100% ready with the code or files you wish to deliver. You can commit as many times as you wish and only when done continue to the next step.

9. Right-click the 

   Status
   subtle true title customer-XXXX

    and select Create pull-request:
   
10.  You will be redirected to Stash where you can select to which branch you wish to transfer your changes. Normally the correct branch (in this example 

    Status
    subtle true title develop

    ) should be selected by default:
    
11. After pressing Create a new pull request (i.e. a request for us to pull your changes into the main branch) will be created and we will be notified about that. However it is better to wither add a comment to an issue or create a new one for us to do it within the expected timeframe.
12. Once the code will be merged it is possible to deploy it which you should also explicitly ask us to do together with the merge request.

Related articles

...