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
a690805a
Unverified
Commit
a690805a
authored
Dec 07, 2018
by
Rémy Huet
💻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GEstion non linéaire
parent
54ba63b6
Pipeline
#31654
passed with stage
in 14 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
0 deletions
+19
-0
docs/plan.md
docs/plan.md
+19
-0
No files found.
docs/plan.md
View file @
a690805a
...
...
@@ -64,6 +64,25 @@ Les sections sont numérotés en niveau 1. Les sous-sections en niveau 2. Une in
*
Pousser des commits
5.
Gestion non-linéaire
1.
Explications théoriques
*
Principe de gestion non linéaire
*
Création d'une divergence
*
Cas 1
*(création d'une branche)*
*
Cas 2
*(création de deux branches)*
*
Explications
*
Illustrations / Exemple
*
Fusion
2.
Application à Git
*
Gestion des branches
*
Changer de branche
*
Visualisation
3.
Fusionner des branches
*
Deux manières de fusionner des branches
*
Le merge
*
Le rebase
*
Avertissement
*
Comparaison avec le merge
*
Application
6.
Résolution de conflits
...
...
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