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
8945f2e7
Commit
8945f2e7
authored
Feb 12, 2018
by
thibault
Browse files
Options
Downloads
Plain Diff
Q3.14
parents
4ff51963
17e161dc
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
chedotal_signarbieux_tp1.md
+12
-7
12 additions, 7 deletions
chedotal_signarbieux_tp1.md
with
12 additions
and
7 deletions
chedotal_signarbieux_tp1.md
+
12
−
7
View file @
8945f2e7
...
...
@@ -218,12 +218,17 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
**git commit -am "Q3.9"**
0.
Merge avec conflit
0.
Céer une nouvelle branche
`mybranch-3.6`
**git branch che_sig_3.6**
0.
Notez dans le CR la date et l'heure actuelle (avec la commande
`date`
par exemple)
`*`
**
date :
13:5
1
**
**13:5
5
**
**git commit -am "Q3.12"**
0.
Switchez sur la nouvelle branche et modifiez la réponse précendante dans le CR avec le
`*`
**git checkout che_sig_3.6**
0.
Réalisez le merge de la brache
`mybranch-3.6`
sur
`mybranch`
. Le prompt change, pourquoi ? Gerer le conflit et commiter.
**git commit -am "Q3.14"**
**git checkout che_sig**
**git merge che_sig_3.6**
**-Gestion de conflit-**
**git commit -am "Q3.14"**
0.
Supprimer les branches de feature et afficher toutes les branches restantes, affichez un historique sous forme de graph (
`a dog`
) de votre repo
`*`
##### 4. Remote
...
...
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