From 9d82c8c97003e56b95804942ab2cef918d31bc28 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Tue, 31 May 2022 17:48:41 +0200 Subject: correct extensions --- 1.md | 6 +++--- img/basic-branching-6.jpg | Bin 7564 -> 0 bytes img/basic-branching-6.png | Bin 0 -> 7564 bytes img/basic-merging-1.jpg | Bin 11863 -> 0 bytes img/basic-merging-1.png | Bin 0 -> 11863 bytes img/basic-merging-2.jpg | Bin 6225 -> 0 bytes img/basic-merging-2.png | Bin 0 -> 6225 bytes 7 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 img/basic-branching-6.jpg create mode 100644 img/basic-branching-6.png delete mode 100644 img/basic-merging-1.jpg create mode 100644 img/basic-merging-1.png delete mode 100644 img/basic-merging-2.jpg create mode 100644 img/basic-merging-2.png diff --git a/1.md b/1.md index b7c0933..3d97bf7 100644 --- a/1.md +++ b/1.md @@ -413,7 +413,7 @@ $ git log --oneline --decorate --graph --all Beti ez da hain erreza. Demagun: -![](img/basic-branching-6.jpg){ height=180px } +![](img/basic-branching-6.png){ height=180px } ## Adarrak eta mergeak — IV @@ -421,7 +421,7 @@ Arbaso amankomuna (*common ancestor*) ateratzen saiatzen da eta bi buruekin eta arbaso amankomunarekin *three-way merge* bat egiten du. ![`git checkout master` -`git merge iss53`](img/basic-merging-1.jpg){ height=180px } +`git merge iss53`](img/basic-merging-1.png){ height=180px } ## Adarrak eta mergeak — V @@ -430,7 +430,7 @@ Commit berri bat gehitzen du, bi adarrak lotzen dituena. *Merge* commita da: bi guraso (edo gehiago) ditu. ![`git checkout master` -`git merge iss53`](img/basic-merging-2.jpg){ height=180px } +`git merge iss53`](img/basic-merging-2.png){ height=180px } ## Konfliktoak — I diff --git a/img/basic-branching-6.jpg b/img/basic-branching-6.jpg deleted file mode 100644 index 6023d69..0000000 Binary files a/img/basic-branching-6.jpg and /dev/null differ diff --git a/img/basic-branching-6.png b/img/basic-branching-6.png new file mode 100644 index 0000000..6023d69 Binary files /dev/null and b/img/basic-branching-6.png differ diff --git a/img/basic-merging-1.jpg b/img/basic-merging-1.jpg deleted file mode 100644 index e1bcc27..0000000 Binary files a/img/basic-merging-1.jpg and /dev/null differ diff --git a/img/basic-merging-1.png b/img/basic-merging-1.png new file mode 100644 index 0000000..e1bcc27 Binary files /dev/null and b/img/basic-merging-1.png differ diff --git a/img/basic-merging-2.jpg b/img/basic-merging-2.jpg deleted file mode 100644 index a243826..0000000 Binary files a/img/basic-merging-2.jpg and /dev/null differ diff --git a/img/basic-merging-2.png b/img/basic-merging-2.png new file mode 100644 index 0000000..a243826 Binary files /dev/null and b/img/basic-merging-2.png differ -- cgit v1.2.3