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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Youssef NIDABRAHIM
2017-F2-Forge
Commits
946f30d6
Commit
946f30d6
authored
Jan 29, 2018
by
Mathilde HENRY
Browse files
Options
Downloads
Patches
Plain Diff
Fin de séance
parent
383c617c
Branches
CogoniHenry
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CogoniHenry.md
+11
-2
11 additions, 2 deletions
CogoniHenry.md
with
11 additions
and
2 deletions
CogoniHenry.md
+
11
−
2
View file @
946f30d6
...
...
@@ -165,8 +165,17 @@ Avant de changer de branche il faut faire un commit pour enregistrer les modific
```
git status
```
3.
Pourquoi n'y a t'il aucune modification en cours ?
`*`
4.
Affichez un historique sous forme de graph (
`a dog`
) de votre repo et décire l'état courant
`*`
3.
Pourquoi n'y a t'il aucune modification en cours ?
Il n'y a aucune modification en cours car la branche 3.1 n'avait aucune modification en cours.
4.
Affichez un historique sous forme de graph (
`a dog`
) de votre repo et décrire l'état courant
`*`
```
git add easy_merge CogoniHenry.md
git commit -m "Q3.4"
git push
git log --graph
```
5.
Merge avec modifications
51.
Mergez les modifications de la branche
`mybranch-2.4`
sur
`mybranch`
(
`*echap* :wq *enter*`
pour sauvegarder le message de commit et quitter)
`*`
52.
Affichez un historique sous forme de graph (
`a dog`
) de votre repo
`*`
...
...
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