diff --git a/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md b/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md index 952acb0..db35313 100644 --- a/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md +++ b/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md @@ -20,3 +20,9 @@ ## Merge conflict ![](https://cdn.breizhhardware.fr/FAKA3/CUgimImu48.png/raw) +## Merge mergesort +![](https://cdn.breizhhardware.fr/FAKA3/NenINaJu95.png/raw) + +## Rebase branch +![](https://cdn.breizhhardware.fr/FAKA3/lacAmIRI44.png/raw) +