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
40504898
Commit
40504898
authored
7 years ago
by
Clement SERRE
Browse files
Options
Downloads
Plain Diff
Q3.1.II - merge error
parents
e2b7cbf4
910e2ac5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cdpw_tp1_SERRE_PRUNIER.md
+24
-13
24 additions, 13 deletions
cdpw_tp1_SERRE_PRUNIER.md
easy_merge
+4
-0
4 additions, 0 deletions
easy_merge
with
28 additions
and
13 deletions
cdpw_tp1_SERRE_PRUNIER.md
+
24
−
13
View file @
40504898
...
...
@@ -251,20 +251,31 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
##### 3. Merge
0. Merge depuis head
1. switcher sur une nouvelle branche `mybranch-3.1`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git checkout -b SERRE_PRUNIER-3.1
Switched to a new branch 'SERRE_PRUNIER-3.1'
M cdpw_tp1_SERRE_PRUNIER.md
```
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git checkout -b SERRE_PRUNIER-3.1
Switched to a new branch 'SERRE_PRUNIER-3.1'
M cdpw_tp1_SERRE_PRUNIER.md
```
0. ajout un nouveau fichier nommé easy_merge avec la date et l'heure actuelle `*`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ echo "19:09 08/01/2018" > easy_merge
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q3.1.II"
[SERRE_PRUNIER 1c053bd] Q3.1.II
1 file changed, 1 insertion(+)
create mode 100644 easy_merge
```
0. merger la branche `mybranch-4.1` sur `mybranch`
```
git
clserre1@A210PC12:/h/Documents/cdpw $ echo "19:09 08/01/2018" > easy_merge
clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"Q3.1.II"
[SERRE_PRUNIER 1c053bd] Q3.1.II
1 file changed, 1 insertion(+)
create mode 100644 easy_merge
```
0. merger la branche `mybranch-4.1` sur `mybranch`
Nous avions fait les modifications sur SERRE_PRUNIER au lieu de SERRE_PRUNIER-3.1. Nous avons recréé un fichier sur cette dernière, d'où les `merges conflicts`.
```
git
clserre1@A210PC12:/h/Documents/cdpw $ git checkout SERRE_PRUNIER
Switched to branch 'SERRE_PRUNIER'
clserre1@A210PC12:/h/Documents/cdpw $ git merge SERRE_PRUNIER-3.1
Auto-merging easy_merge
CONFLICT (add/add): Merge conflict in easy_merge
Auto-merging cdpw_tp1_SERRE_PRUNIER.md
CONFLICT (content): Merge conflict in cdpw_tp1_SERRE_PRUNIER.md
Automatic merge failed; fix conflicts and then commit the result.
```
0. Afficher le status
0. Pourquoi n'y a t'il aucune modification en cours ? `*`
0. Affichez un historique sous forme de graph (`a dog`) de votre repo et décire l'état courant`*`
...
...
This diff is collapsed.
Click to expand it.
easy_merge
+
4
−
0
View file @
40504898
19:09 08/01/2018
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