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
Show whitespace changes
Inline Side-by-side
home.md
View page @ dcf45626
......@@ -164,21 +164,22 @@ Using GitLab and according to the GIT branching and testing strategy introduced
0- Log in GitLab and go to the GitLab project main page
:::If a red message apears at the top, you can close it
:::
```
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'
......@@ -188,21 +189,21 @@ EITHER from GitLab
* 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
......@@ -218,11 +219,11 @@ EITHER from GitLab
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"
......@@ -232,4 +233,4 @@ EITHER from GitLab
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"
---
```
Clone repository
  • FAQ
  • Home