Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
2017-F2-Forge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Youssef NIDABRAHIM
2017-F2-Forge
Commits
7547e1b6
Commit
7547e1b6
authored
7 years ago
by
thibault
Browse files
Options
Downloads
Patches
Plain Diff
Q3.5
parent
f98b7358
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
chedotal_signarbieux_tp1.md
+6
-2
6 additions, 2 deletions
chedotal_signarbieux_tp1.md
with
6 additions
and
2 deletions
chedotal_signarbieux_tp1.md
+
6
−
2
View file @
7547e1b6
...
...
@@ -199,8 +199,12 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
**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.
Afficher le status
**git status**
0.
Pourquoi n'y a t'il aucune modification en cours ?
`*`
**Car nous venons de merger la branche sur laquelle on a fait les modifications**
**git add .**
**git commit -am "Q3.5"**
0.
Affichez un historique sous forme de graph (
`a dog`
) de votre repo et décire l'état courant
`*`
0.
Merge avec modifications
0.
Mergez les modifications de la branche
`mybranch-2.4`
sur
`mybranch`
(
`*echap* :wq *enter*`
pour sauvegarder le message de commit et quitter)
`*`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment