... | ... | @@ -25,14 +25,12 @@ git config --global alias.alog "log --graph --oneline --all --decorate" |
|
|
```
|
|
|
You can now use `git alog to see the commit history.
|
|
|
|
|
|
## Get the Gmsh source code
|
|
|
## Get the SLIM source code
|
|
|
|
|
|
Clone the [Gmsh official repositoy](http://gitlab.onelab.info/gmsh/gmsh)
|
|
|
|
|
|
If you do not have an account, you can create one in the "Register" tab of the [onelab gitlab website](http://gitlab.onelab.info).
|
|
|
Clone the [SLIM official repositoy](https://git.immc.ucl.ac.be/slim/slim/)
|
|
|
|
|
|
```
|
|
|
git clone http://username@gitlab.onelab.info/gmsh/gmsh.git
|
|
|
git clone https://username@git.immc.ucl.ac.be/slim/slim.git
|
|
|
```
|
|
|
(replace `username` by your login)
|
|
|
|
... | ... | @@ -108,14 +106,6 @@ git push |
|
|
```
|
|
|
The `git push` command will print a message with the url where you can create a merge request for your branch.
|
|
|
|
|
|
PS: you could also do
|
|
|
```
|
|
|
git checkout master
|
|
|
git pull
|
|
|
git checkout myfeature
|
|
|
git merge master
|
|
|
git push
|
|
|
```
|
|
|
## Fixing conflicts
|
|
|
|
|
|
If conflicts occur during a rebase or a merge, git will stop and you will have to fix them.
|
... | ... | |