From 40615741c7a1271b198ce979dbe7784ebb3442d7 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Tue, 24 May 2022 18:05:43 +0200 Subject: basic merging --- img/basic-branching-4.png | Bin 0 -> 9838 bytes img/basic-branching-5.png | Bin 0 -> 8843 bytes img/basic-branching-6.jpg | Bin 0 -> 7564 bytes img/basic-merging-1.jpg | Bin 0 -> 11863 bytes img/basic-merging-2.jpg | Bin 0 -> 6225 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 img/basic-branching-4.png create mode 100644 img/basic-branching-5.png create mode 100644 img/basic-branching-6.jpg create mode 100644 img/basic-merging-1.jpg create mode 100644 img/basic-merging-2.jpg (limited to 'img') diff --git a/img/basic-branching-4.png b/img/basic-branching-4.png new file mode 100644 index 0000000..ab8f222 Binary files /dev/null and b/img/basic-branching-4.png differ diff --git a/img/basic-branching-5.png b/img/basic-branching-5.png new file mode 100644 index 0000000..947133f Binary files /dev/null and b/img/basic-branching-5.png differ diff --git a/img/basic-branching-6.jpg b/img/basic-branching-6.jpg new file mode 100644 index 0000000..6023d69 Binary files /dev/null and b/img/basic-branching-6.jpg differ diff --git a/img/basic-merging-1.jpg b/img/basic-merging-1.jpg new file mode 100644 index 0000000..e1bcc27 Binary files /dev/null and b/img/basic-merging-1.jpg differ diff --git a/img/basic-merging-2.jpg b/img/basic-merging-2.jpg new file mode 100644 index 0000000..a243826 Binary files /dev/null and b/img/basic-merging-2.jpg differ -- cgit v1.2.3