diff --git a/git.md b/git.md index 803378cef03cd4f6dcf094dcc63ffa1739d15725..386ef3a7403ac8e87c70c4c805629fb9995cb35f 100644 --- a/git.md +++ b/git.md @@ -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 cd example-conflict +# découvrir la branche feature/rabbit +git checkout feature/rabbit +git checkout master + # Conflit lors de la fusion git merge feature/rabbit ``` diff --git a/gitlab.md b/gitlab.md index 23603ff7950f8e9f5ccab99a9885042849b7a060..e05a9b8df8781485bb835d5fe79fad300d1aa9e6 100644 --- a/gitlab.md +++ b/gitlab.md @@ -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 Permet de définir des échances