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
4b78aee8
Commit
4b78aee8
authored
7 years ago
by
Dorian Selimovic
Browse files
Options
Downloads
Patches
Plain Diff
Q3.7
parent
677502ec
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
selimovic-compte-rendu.md
+51
-0
51 additions, 0 deletions
selimovic-compte-rendu.md
with
51 additions
and
0 deletions
selimovic-compte-rendu.md
+
51
−
0
View file @
4b78aee8
...
...
@@ -465,7 +465,58 @@ v
```
0.
Réalisez le merge de la brache
`mybranch-3.6`
sur
`mybranch`
. Le prompt change, pourquoi ? Gerer le conflit et commiter.
```
$ git checkout selimovic
Switched to branch 'selimovic'
$ git merge selimovic-3.6
Auto-merging selimovic-compte-rendu.md
CONFLICT (content): Merge conflict in selimovic-compte-rendu.md
Automatic merge failed; fix conflicts and then commit the result.
$ git add -A
$ git commit -m "Solve conflict while merging selimovic-3.6 into selimovic"
[selimovic 677502e] Solve conflict while merging selimovic-3.6 into selimovic
```
0.
Supprimer les branches de feature et afficher toutes les branches restantes, affichez un historique sous forme de graph (
`a dog`
) de votre repo
`*`
```
$ git branch -d selimovic-2.4
Deleted branch selimovic-2.4 (was ae470aa).
$ git branch -d selimovic-3.1
Deleted branch selimovic-3.1 (was 0d8fcb8).
$ git branch -d selimovic-3.6
Deleted branch selimovic-3.6 (was 4e7f0e3).
$ git log --all --decorate --oneline --graph
* 677502e (HEAD -> selimovic) Solve conflict while merging selimovic-3.6 into selimovic
|\
| * 4e7f0e3 Q3.6.3
* | 704d8d6 Q3.6.2
|/
* bec7f38 Q3.5.2
* 1032a2f Merge branch 'selimovic-2.4' into selimovic
|\
| * ae470aa Q2.4.3
| * 77e2569 Q2.4.2
* | 2fadf41 Q3.4
* | 1a2af7c Q3.3
* | 0d8fcb8 Q3.1.2
* | 6ff966f Q2.11
* | 4b3e42e Q2.10
* | b41b6f3 Q2.7
* | 9b99cb6 Q2.6
|/
* 434403c Q2.3
* 992376b Q2.2
| * 3ed4f76 (master) Add new_file
|/
* 7a07334 Q1.15
* 02672f8 Q1.13
* 696e5f9 Q1.10
* db1ca34 Q1.9
* 80d9397 Rename compte-rendu
* e4e58b9 Q1.5
* f256d85 Q1.3
* 6bd3cbb Add compte-rendu.md
```
##### 4. Remote
0.
Afficher l'historique 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