Skip to content
Snippets Groups Projects
Unverified Commit 43542027 authored by thoth's avatar thoth
Browse files

feat: add lines

parent 42c19f8c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
git.md
+ 4
− 0
View file @ 43542027
...@@ -335,6 +335,10 @@ pour cela, on retoune sur la branche cible, et on utilise merge ...@@ -335,6 +335,10 @@ pour cela, on retoune sur la branche cible, et on utilise merge
git clone https://gitlab.clubelek.fr/formations/software-engineering/example-conflict.git git clone https://gitlab.clubelek.fr/formations/software-engineering/example-conflict.git
cd example-conflict cd example-conflict
# découvrir la branche feature/rabbit
git checkout feature/rabbit
git checkout master
# Conflit lors de la fusion # Conflit lors de la fusion
git merge feature/rabbit git merge feature/rabbit
``` ```
......
gitlab.md
+ 6
− 0
View file @ 43542027
...@@ -167,6 +167,12 @@ Priorité :  ...@@ -167,6 +167,12 @@ Priorité : 
--- ---
**Exemple**
[https://gitlab.clubelek.fr/formations/software-engineering/example-remote/issues](https://gitlab.clubelek.fr/formations/software-engineering/example-remote/issues)
---
## Milestones ## Milestones
Permet de définir des échances Permet de définir des échances
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment