Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Git
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Picasoft
A
APIs
Init
Git
Commits
95e8d108
Unverified
Commit
95e8d108
authored
Dec 07, 2018
by
Rémy Huet
💻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Résolution des conflits
parent
a690805a
Pipeline
#31656
passed with stage
in 14 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
docs/plan.md
docs/plan.md
+11
-0
No files found.
docs/plan.md
View file @
95e8d108
...
...
@@ -85,5 +85,16 @@ Les sections sont numérotés en niveau 1. Les sous-sections en niveau 2. Une in
*
Application
6.
Résolution de conflits
1.
Les conflits
*
Qu'est-ce qu'un conflit ?
*
Exemple de situation conflictuelle
*
Comment se présente un conflit ?
*
Concrètement, quand peut-on avoir un conflit ?
*
Merge
*
Rebase
*
Pull
2.
Résoudre un conflit
*
En théorie
*
Application
7.
Travail collaboratif avec Git et Gitlab
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment