Before programming: create a new branch from master

Download one version of LBM_Saclay

For example here LBM_Saclay_Rech-Dev version, the command git clone

$ git clone --recursive https://codev-tuleap.cea.fr/plugins/git/lbmsaclay/LBM_Saclay_Rech-Dev.git

Check your current branch

Check your current branch

Once the download is complete, go to LBM_Saclay_Rech-Dev directory

$ cd LBM_Saclay_Rech-Dev
$ git status

returns:

Sur la branche master
Votre branche est a jour avec 'origin/master'.

rien a valider, la copie de travail est propre

means that you are currently on the master.

Create a new branch

Create a new branch

  1. Create a new branch, example name of the new branch dev/alain.cartalade

    $ git branch dev/alain.cartalade

  2. Move on that new branch

    $ git checkout dev/alain.cartalade

  3. Check

    $ git status

Move on one existing branch

Move on one existing branch

Example to move on one existing branch dev/hoel.keraudren

$ git checkout dev/hoel.keraudren

Copy and rename one existing branch

Copy one existing branch

Example to copy and rename one existing branch e.g. development

  1. Basculement sur la branche development

    $ git checkout development

  2. New branch dev/alain.cartalade copied from development + switch

    $ git checkout -b dev/alain.cartalade

  3. Create the new branch on Tuleap + link to the local one

    $ git push -u origin dev/alain.cartalade

  4. You can start your developments on your branch.

After programming: push your developments

Check the modifications on the current branch

$ git status

Add your comment and push your developments

Add, comment and push

$ git add * (or -all)       # add new modifications
$ git commit -m "comment"   # add new comments related to modifications
$ git push                  # push modifications on git

Compilation and run

For ORCUS, follow the instructions:

For project admin

Merge branch dev/firstname.name

Merge one branch in master

Stay on branch master and merge the branch you want:

$ git merge origin/dev/aurelien.laurens
$ git add *
$ git commit -m "Merge branche dev/aurelien.laurens"
$ git push

Cancel your last commit

Merge one branch in master

$ git status
$ git reset --hard HEAD~1
$ git push --force

Section author: Alain Cartalade