From 7b29d3f229d60c4ae7e3922b10c6f5d393be1ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20MARQUET?=
 <72651575+BreizhHardware@users.noreply.github.com>
Date: Wed, 14 Jan 2026 09:36:42 +0100
Subject: [PATCH] Obisidian vault auto-backup: 14-01-2026 09:36:42 on . 1 files
 edited

---
 ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md | 6 ++++++
 1 file changed, 6 insertions(+)

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)
+