Skip to content
Snippets Groups Projects
Verified Commit c1979904 authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

updated diagrams

parent e38050f9
No related branches found
No related tags found
2 merge requests!129[release] Regular merge of develop,!127Review part 1
......@@ -4,7 +4,6 @@
<center>
<img src="slides/img/fork.jpg" class="as-is" height="500em"/>
</center>
<!--http://www.cndajin.com/data/wls/246/22302193.jpg-->
......@@ -23,8 +22,9 @@
- In general, by default, you can only **read** files in a repository. You **cannot write**.
<div class="fragment">
<img src="slides/img/forking.png" height="400px">
<div align="center">
<img src="slides/img/forking.png" width="80%">
</div>
- You have to work on your **own copy** of the repository in order to make changes.
- In other words, you have to work on your own <font color="red">**fork**</font>.
......
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png

64.6 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png

131 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png
  • 2-up
  • Swipe
  • Onion skin
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png

58.6 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png

118 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png
2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png
  • 2-up
  • Swipe
  • Onion skin
2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png

63.1 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png

125 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png
2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png
2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png
2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png
  • 2-up
  • Swipe
  • Onion skin
2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png

66.9 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png

138 KiB | W: | H:

2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png
2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png
2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png
2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -17,12 +17,15 @@ You have to <font color="color:red">merge</font> the branches.
# What happened in the background?
<div style="position:absolute;top:2em" class="fragment fade-in-then-out" data-fragment-index="1">
<div align="center">
<img src="slides/img/fork_branch-diagram-after-commit.png" height="600px" >
</div>
<div style="position:absolute;top:2em" class="fragment fade-in-then-out" data-fragment-index="1">
# What happened in the background?
<div align="center">
<img src="slides/img/fork_branch-diagram-after-commit-with-back-arrow.png" height="600px" >
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment