update README file
This commit is contained in:
parent
96bf638364
commit
dc6774c778
36
README.md
36
README.md
@ -1,6 +1,10 @@
|
||||
# Intro
|
||||
|
||||
blabla
|
||||
We created this set of exercises to give you the opportunity to express yourself technically. Do as much as you can in
|
||||
the time you have. Feel free to ask us questions, if any. No worries if you can't make it all by lack of time or
|
||||
understanding of what we're asking. We'll defrief it with you during our next call.
|
||||
|
||||
**Have fun!**
|
||||
|
||||
## Fork
|
||||
|
||||
@ -42,28 +46,28 @@ Bonus, on that instance, make sure a web server (`nginx`) is running.
|
||||
|
||||
Push your `main.tf` file in ex3 folder.
|
||||
|
||||
|
||||
# Ex. 4 - git
|
||||
|
||||
In this repo, there are two branches:
|
||||
* stein
|
||||
* queens
|
||||
|
||||
- stein
|
||||
- queens
|
||||
|
||||
Stein contains the following commits:
|
||||
|
||||
* 1ff2641 (stein) G
|
||||
* cf24853 F
|
||||
* 3fcdfa0 E
|
||||
* cb8c71a D
|
||||
* 849ef26 C
|
||||
* 372c155 B
|
||||
* edc8ed7 A
|
||||
- 1ff2641 (stein) G
|
||||
- cf24853 F
|
||||
- 3fcdfa0 E
|
||||
- cb8c71a D
|
||||
- 849ef26 C
|
||||
- 372c155 B
|
||||
- edc8ed7 A
|
||||
|
||||
Queens contains the following commits:
|
||||
|
||||
* 2624c16 (queens) F
|
||||
* 5e3521b B
|
||||
* edc8ed7 A
|
||||
- 2624c16 (queens) F
|
||||
- 5e3521b B
|
||||
- edc8ed7 A
|
||||
|
||||
So the common ancestor is A (same commit ID).
|
||||
|
||||
@ -74,6 +78,7 @@ F has also been cherry-picked but with conflicts (solved, of course).
|
||||
## Exercice
|
||||
|
||||
You will need to create two branches:
|
||||
|
||||
- merged
|
||||
- rebased
|
||||
|
||||
@ -86,6 +91,7 @@ git checkout -b merged origin/queens
|
||||
```
|
||||
|
||||
Then merge the stein branch into your branch
|
||||
|
||||
```bash
|
||||
git merge origin/stein
|
||||
```
|
||||
@ -94,10 +100,10 @@ You will have a conflict to solved.
|
||||
|
||||
Solve it, then push your `merged` branch to your repo.
|
||||
|
||||
|
||||
### Rebased
|
||||
|
||||
Now create the rebased branch:
|
||||
|
||||
```bash
|
||||
git checkout -b rebased origin/queens
|
||||
```
|
||||
|
Loading…
Reference in New Issue
Block a user