Skip to content
Snippets Groups Projects
Commit b73a3022 authored by NIDABRAHIM Youssef's avatar NIDABRAHIM Youssef
Browse files

Q3.3

parent 4a165c0b
No related branches found
No related tags found
No related merge requests found
......@@ -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"
```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment