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
8cf25e63
Commit
8cf25e63
authored
7 years ago
by
Clement SERRE
Browse files
Options
Downloads
Patches
Plain Diff
23.4.i
parent
984b0f55
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
cdpw_tp1_SERRE_PRUNIER.md
+34
-0
34 additions, 0 deletions
cdpw_tp1_SERRE_PRUNIER.md
with
34 additions
and
0 deletions
cdpw_tp1_SERRE_PRUNIER.md
+
34
−
0
View file @
8cf25e63
...
...
@@ -363,7 +363,41 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
```
0. Merge avec modifications
1. Mergez les modifications de la branche `mybranch-2.4` sur `mybranch` (`*echap* :wq *enter*` pour sauvegarder le message de commit et quitter)`*`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git merge SERRE_PRUNIER-2.3
Auto-merging cdpw_tp1_SERRE_PRUNIER.md
Merge made by the 'recursive' strategy.
cdpw_tp1_SERRE_PRUNIER.md | 54 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 51 insertions(+), 3 deletions(-)
```
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git log --all --decorate --oneline --graph
*
984b0f5 (HEAD -> SERRE_PRUNIER) Merge branch 'SERRE_PRUNIER-3.3' into SERRE_PRUNIER
|
\
|
*
939141b (SERRE_PRUNIER-2.3) Q2.3.III
|
*
4695520 Q2.3.II
*
| 313b711 (master/SERRE_PRUNIER) Q3.3
*
| 4050489 Q3.1.II - merge error
|
\
\
|
*
| 910e2ac (SERRE_PRUNIER-3.1) Q3.1.II
*
| | e2b7cbf Q3.1.II
*
| | 87d1e67 Q3.1.II
*
| | 40028cb Q2.13
|/ /
*
| 665723e Q2.12
*
| 51905a3 Q2.5
|/
*
a4e6b94 Q2.2
*
bd03bc0 Q2.1
*
ef6b3f6 Q1.14
|
*
9586626 (master) Q2.10
|/
*
9573e3c Q1.12
*
3bd908e Q1.9
*
b28292b Q1.8
*
dd449ba Q1.6
*
7b7f60f Q1.2
```
0. Merge avec conflit
1. Céer une nouvelle branche `mybranch-3.6`
0. Notez dans le CR la date et l'heure actuelle (avec la commande `date` par exemple) `*`
...
...
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