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
b73a3022
Commit
b73a3022
authored
7 years ago
by
NIDABRAHIM Youssef
Browse files
Options
Downloads
Patches
Plain Diff
Q3.3
parent
4a165c0b
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
REDA_YOUSSEF.md
+21
-5
21 additions, 5 deletions
REDA_YOUSSEF.md
with
21 additions
and
5 deletions
REDA_YOUSSEF.md
+
21
−
5
View file @
b73a3022
...
...
@@ -517,16 +517,32 @@ Switched to a new branch 'reda_youssef-3.1'
0. merger la branche `mybranch-3.1` sur `mybranch`
```
git checkout reda_youssef
git merge reda_youssef_3
$ git checkout reda_youssef
Switched to branch 'reda_youssef'
```
```
$ git merge reda_youssef-3.1
Updating f258f21..4a165c0
Fast-forward
REDA_YOUSSEF.md | 21 +++++++++++++++------
easy_merge | 1 +
2 files changed, 16 insertions(+), 6 deletions(-)
```
0. Afficher le status
```
git status
$ git status
On branch reda_youssef
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: REDA_YOUSSEF.md
no changes added to commit (use "git add" and/or "git commit -a")
```
0. Pourquoi n'y a t'il aucune modification en cours ? `*`
``
`
can on a rien fait sur la branche reda_youssef
> Normalement, on n'aura pas de modification à commiter après un merge puisqu'ils sont déjà commiter dans la branche `rda_youssef-3.1
`
```
git add .
git commit -m "Q3.3"
```
...
...
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