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

Q3.5.2

parent 04680c80
No related branches found
No related tags found
No related merge requests found
...@@ -795,15 +795,46 @@ Merge made by the 'recursive' strategy. ...@@ -795,15 +795,46 @@ Merge made by the 'recursive' strategy.
``` ```
> On commite cette étape Q3.5.1 > On commite cette étape Q3.5.1
``` ```
git add . $ git add .
git commit -m "Q3.5.1" $ git commit -m "Q3.5.1"
[reda_youssef 04680c8] Q3.5.1
1 file changed, 8 insertions(+), 2 deletions(-)
``` ```
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*` 0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
``` ```
git log --all --graph --decorate --oneline $ git log --all --graph --decorate --oneline
git add . * 04680c8 (HEAD -> reda_youssef) Q3.5.1
* 563d694 Merge branch 'reda_youssef-2.4' into reda_youssef
|\
| * 02a31d5 (reda_youssef-2.4) Q2.4.5
| * d72c9c1 Q2.4.4
| * 3dd3708 Q2.4.3
| * 12bae9c Q2.4.2
* | cbc5756 Q3.4
* | b73a302 Q3.3
* | 4a165c0 (reda_youssef-3.1) Q3.1.2
* | f258f21 Q2.11
* | ca0e5da Q2.10
* | f50a0e6 Q2.6
|/
* 71592a8 Q2.3
* 03c3017 Q2.2
| * b2acb20 (master) Q2.9
|/
* 717b390 Q1.15
* 715a4ee Q1.13
* 51a5add Q1.10
* a38f03f Q1.9
* abfd2d9 Q1.7
* 3ec344e Q1.3
```
> On commite cette étape Q3.5.2
```
$ git add .
git commit -m "Q3.5.2" git commit -m "Q3.5.2"
``` ```
0. Merge avec conflit 0. Merge avec conflit
0. Céer une nouvelle branche `mybranch-3.6` 0. Céer une nouvelle branche `mybranch-3.6`
``` ```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment