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
Dorian SELIMOVIC
2017-F2-Forge
Commits
5418d77f
Commit
5418d77f
authored
7 years ago
by
BMosnier
Browse files
Options
Downloads
Patches
Plain Diff
Q3.3
parent
4a43defe
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
MosnierDrosneTp1.md
+22
-3
22 additions, 3 deletions
MosnierDrosneTp1.md
with
22 additions
and
3 deletions
MosnierDrosneTp1.md
+
22
−
3
View file @
5418d77f
...
...
@@ -318,19 +318,38 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
##### 3. Merge
0.
Merge depuis head
0.
switcher sur une nouvelle branche
`mybranch-3.1`
0. switcher sur une nouvelle branche `mybranch-3.1`
$ git checkout -b MosnierDrosne-3.1
Switched to a new branch 'MosnierDrosne-3.1'
0.
ajout un nouveau fichier nommé easy_merge avec la date et l'heure actuelle
`*`
0. ajout un nouveau fichier nommé easy_merge avec la date et l'heure actuelle `*`
$ date > easy_merge
$ git add easy_merge
0.
merger la branche
`mybranch-4.1`
sur
`mybranch`
0. merger la branche `mybranch-4.1` sur `mybranch`
$ git checkout MosnierDrosne
Switched to branch 'MosnierDrosne'
$ git merge MosnierDrosne-3.1
Updating 7d765e9..4a43def
Fast-forward
MosnierDrosneTp1.md | 8 ++++++++
easy_merge | 1 +
2 files changed, 9 insertions(+)
create mode 100644 easy_merge
0.
Afficher le status
$ git status
On branch MosnierDrosne
nothing to commit, working tree clean
0.
Pourquoi n'y a t'il aucune modification en cours ?
`*`
> Parce qu'on a rien changé dur MosnierDrosne et que les changements sur MosnierDrosne-3.1 avaient été commités ?
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