Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SDA
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Julien David
SDA
Commits
5c2b975a
Commit
5c2b975a
authored
4 years ago
by
david
Browse files
Options
Downloads
Patches
Plain Diff
merge TP3 et TP4 indenté
parent
7da3b1ee
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#660
failed
4 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README.md
+5
-0
5 additions, 0 deletions
README.md
with
5 additions
and
0 deletions
README.md
+
5
−
0
View file @
5c2b975a
...
...
@@ -22,10 +22,15 @@ Le nom de votre branche est constitué de vos numéros d'étudiants séparés pa
### Pour conserver les données du tp3 et récupérer le tp4
Placez vous dans votre branche du tp3.
`git checkout tp3_NUMERO1_NUMERO2`
Créez la branche du tp4 à partir de celle du tp3.
`git checkout -b tp4_NUMERO1_NUMERO2`
Fusionnez cette nouvelle branche avec le tp4
`git merge -Xtheirs tp4`
Modifier la strcture de tas pour pouvoir extraire la clé de plus petite valeur.
...
...
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