diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/forks.md b/2022/2022-05-31_git-trilogy-part-1/slides/forks.md index f958de248538688433e3f2fd35197eeab3fde2a9..a778f65bbd610465c1d52ecb7cad345fa71b50f3 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/forks.md +++ b/2022/2022-05-31_git-trilogy-part-1/slides/forks.md @@ -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>. diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png index e505ba66abad7597fd9fd710941b3311115b3b7b..9b2cc2475efff822f8eff39d8b810efad1c8e6f3 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit-with-back-arrow.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png index 15bbcd61416a91b0cb346d79520dcbf702aacf9d..ee32953aa2c028088d422424cae11f0fe57e448e 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/fork_branch-diagram-after-commit.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png index 09e317784ad2a2bcb2a0e5b08cf8ecc06eeb4602..99f25a1a3140d044c2c5954f4162f6d8780ecea5 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png index f92a2e5130dc5f5480607a8eb2272364901467a8..4a974d117c286990688cc29fb7eb19c9efabdde0 100644 Binary files a/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png and b/2022/2022-05-31_git-trilogy-part-1/slides/img/forking_detail-with-branches.png differ diff --git a/2022/2022-05-31_git-trilogy-part-1/slides/merge.md b/2022/2022-05-31_git-trilogy-part-1/slides/merge.md index e71182f1b6a9c2aa3f6bf26fd01281a7dd538f50..204482b5c233171a89f661f211a463cca0c33509 100644 --- a/2022/2022-05-31_git-trilogy-part-1/slides/merge.md +++ b/2022/2022-05-31_git-trilogy-part-1/slides/merge.md @@ -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>