Skip to content
Snippets Groups Projects
Commit f98b7358 authored by thibault's avatar thibault
Browse files

Q3.3

parent 01c40f95
No related branches found
No related tags found
No related merge requests found
......@@ -195,7 +195,10 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
**touch easy_merge**
**git add .**
**git commit -am "Q3.2"**
0. merger la branche `mybranch-4.1` sur `mybranch`
0. merger la branche `mybranch-3.1` sur `mybranch`
**git commit -am "Q3.3"**
**git checkout che_sig**
**git merge che_sig-3.1**
0. Afficher le status
0. Pourquoi n'y a t'il aucune modification en cours ? `*`
0. Affichez un historique sous forme de graph (`a dog`) de votre repo et décire l'état courant`*`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment