Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • S s2dverification
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 65
    • Issues 65
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 7
    • Merge requests 7
  • Deployments
    • Deployments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • Earth SciencesEarth Sciences
  • s2dverification
  • Wiki
  • Home

Home · Changes

Page history
Update home authored Dec 22, 2017 by Alasdair Hunter's avatar Alasdair Hunter
Hide whitespace changes
Inline Side-by-side
home.md
View page @ 4c4267e0
......@@ -181,56 +181,56 @@ Using GitLab and according to the GIT branching and testing strategy introduced
```
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"
- 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
- 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'
- 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:
- 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:
- 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:
- 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
- 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.
- 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"
- Assign to the project coordinator
- Click on "Submit merge request"
```
Clone repository
  • FAQ
  • Home