home.md

@@ -159,4 +159,78 @@ In the 's2dverification' project main folder you can see a few files that fulfil
 Using GitLab and according to the GIT branching and testing strategy introduced in 2014/11, every time you want to perform a new development, you must follow the steps in the image, explained in detail below. 
 
 ![developing_s2dv](/uploads/1de18ee6931826e87d75e39e63810da2/developing_s2dv.png) 
-### Developer steps
\ No newline at end of file
+
+### Developer steps
+
+0- Log in GitLab and go to the GitLab project main page
+
+---
+· If a red message apears at the top, you can close it
+---
+
+1- Open a new issue
+
+---
+· Issues -> + New Issue -> Submit new issue
+ · Put title, description and label. Write @username to notify people
+ · Click on "Submit new issue"
+ · You can then see a list with all the issues. Each is assigned an #issue_number
+---
+
+2- Create a branch from 'master'
+
+---
+EITHER from GitLab
+ · Commits -> Branches -> New branch
+ · Put name of the new branch and the name of the branch you check off from, in this case 'master'
+ · Click on "Create branch"
+ OR from terminal
+ · git fetch origin
+ · git checkout master
+ · git pull
+ · git checkout -b branch_name
+---
+
+3- Perform feature/bugfix commits
+
+---
+· Open terminal
+ (· git fetch)(only if created from GitLab)
+ · Checkout to the new branch
+ · Make changes
+ · Last commit must finish with 'Fixes #issue_number'
+---
+
+4- Check that everything is fine
+
+---
+· Run the script /shared/earth/software/scripts/test-s2dverification branch_name. It will do atomatically:
+   a) rebase master into the development branch
+   b) build the package tarball
+   c) check the tarball
+ · If any error raises during rebase do:
+   git merge --no-ff master
+   fix conflicts
+   commit
+   try 4- again
+ · If any error raises during build or check:
+   build and check manually (follow instructions in wiki in section How to develop > How to build and check manually)
+   fix errors
+   commit
+   try 4- again
+ · git push origin HEAD
+---
+
+5- Create a merge request
+
+---
+· Merge Requests -> New Merge Request
+ · Choose origin and destiny
+ · Click on "Compare branches"
+ · Fill in title and description.
+   Description field should contain testers referenced with @tester_name
+   If any comment is needed put there
+   Select a milestone for the feature, so that it's associated to a deadline. If there's no associated milestone you can create one or specify a deadline for the feature to be tested in the text
+ · Assign to the project coordinator
+ · Click on "Submit merge request"
+---