diff options
-rw-r--r-- | 1.md | 6 | ||||
-rw-r--r-- | img/basic-branching-6.png (renamed from img/basic-branching-6.jpg) | bin | 7564 -> 7564 bytes | |||
-rw-r--r-- | img/basic-merging-1.png (renamed from img/basic-merging-1.jpg) | bin | 11863 -> 11863 bytes | |||
-rw-r--r-- | img/basic-merging-2.png (renamed from img/basic-merging-2.jpg) | bin | 6225 -> 6225 bytes |
4 files changed, 3 insertions, 3 deletions
@@ -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.png Binary files differindex 6023d69..6023d69 100644 --- a/img/basic-branching-6.jpg +++ b/img/basic-branching-6.png diff --git a/img/basic-merging-1.jpg b/img/basic-merging-1.png Binary files differindex e1bcc27..e1bcc27 100644 --- a/img/basic-merging-1.jpg +++ b/img/basic-merging-1.png diff --git a/img/basic-merging-2.jpg b/img/basic-merging-2.png Binary files differindex a243826..a243826 100644 --- a/img/basic-merging-2.jpg +++ b/img/basic-merging-2.png |