From b83189f5294b976979c7e4664b6b4d39d9754d78 Mon Sep 17 00:00:00 2001 From: ArminNouri98 <107566068+ArminNouri98@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:06:23 +0100 Subject: [PATCH 1/3] Add files via upload I just try push on git --- main.txt | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 main.txt diff --git a/main.txt b/main.txt new file mode 100644 index 0000000..7d8c459 --- /dev/null +++ b/main.txt @@ -0,0 +1,134 @@ +a) How many commits are there in the cyf-demo-repo project?16 + +b) Who committed on Oct 31, 2020? +commit 5cd51b2dbeff9bd21df2b2e902ee3f3ad4959978 +Author: Claire Bickley +Date: Sat Oct 31 12:02:05 2020 +0000 + + blank answers + +commit 7bceb9e17384aa19bff8446040903e7888c67749 +Author: Claire Bickley +Date: Sat Oct 31 11:59:13 2020 +0000 + + Update other-file.txt + +commit 94872bf6152fde6cb01f0361879d02dc37ae38bd +Author: Claire Bickley +Date: Sat Oct 31 11:54:06 2020 +0000 + + answrered questions + +commit e508be650bd0ab2ab5bb3347e6b5bf1a561c276b +Author: Daniel Wagner-Hall +Date: Fri Oct 16 22:44:16 2020 +0100 + + Initial commit +:...skipping... +commit 5cd51b2dbeff9bd21df2b2e902ee3f3ad4959978 +Author: Claire Bickley +Date: Sat Oct 31 12:02:05 2020 +0000 + + blank answers + +commit 7bceb9e17384aa19bff8446040903e7888c67749 +Author: Claire Bickley +Date: Sat Oct 31 11:59:13 2020 +0000 + + Update other-file.txt + +commit 94872bf6152fde6cb01f0361879d02dc37ae38bd +Author: Claire Bickley +Date: Sat Oct 31 11:54:06 2020 +0000 + + answrered questions + +commit e508be650bd0ab2ab5bb3347e6b5bf1a561c276b +Author: Daniel Wagner-Hall +Date: Fri Oct 16 22:44:16 2020 +0100 + + Initial commit +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +(END) +commit 5cd51b2dbeff9bd21df2b2e902ee3f3ad4959978 +Author: Claire Bickley +Date: Sat Oct 31 12:02:05 2020 +0000 + + blank answers + +commit 7bceb9e17384aa19bff8446040903e7888c67749 +Author: Claire Bickley +Date: Sat Oct 31 11:59:13 2020 +0000 + + Update other-file.txt + +commit 94872bf6152fde6cb01f0361879d02dc37ae38bd +Author: Claire Bickley +Date: Sat Oct 31 11:54:06 2020 +0000 + + answrered questions + +commit e508be650bd0ab2ab5bb3347e6b5bf1a561c276b +Author: Daniel Wagner-Hall +Date: Fri Oct 16 22:44:16 2020 +0100 + + Initial commit +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +~ +!Q +/usr/bin/bash: line 1: Q: command not found +!done (press RETURN) + + +c) What changes did illictonion make in the commit titled “Revert changes accidentally pushed in the past”? + +d) How many files were added in the first commit? What were the names of the files? + +e) What is the hash for the first commit in the history? + +f) What is Claire Bickley’s favourite food? \ No newline at end of file From aa51857ab16b4b4c2026769927bc3a2e91804596 Mon Sep 17 00:00:00 2001 From: Armin Date: Sat, 5 Oct 2024 14:01:08 +0100 Subject: [PATCH 2/3] I did --- capital.txt | 2 +- file.txt | 3 ++- javascript.txt | 1 + lovelace.txt | 1 + other-file.txt | 4 ++-- programming.txt | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/capital.txt b/capital.txt index d4c6c94..ed87344 100644 --- a/capital.txt +++ b/capital.txt @@ -1 +1 @@ -What is the capital city of Slovenia? +What is the capital city of Slovenia?Ljubljana diff --git a/file.txt b/file.txt index 3df4ebd..365d849 100644 --- a/file.txt +++ b/file.txt @@ -4,5 +4,6 @@ If you're reading this on your computer, congratulations, you've cloned your fir Here's a question for you to answer: -Queston: What is your favourite dessert food? +Queston: What is your favourite dessert food? Your answer: +Pizza \ No newline at end of file diff --git a/javascript.txt b/javascript.txt index eddbeb6..5879e21 100644 --- a/javascript.txt +++ b/javascript.txt @@ -1 +1,2 @@ How old is the JavaScript programming language? + 29 years old \ No newline at end of file diff --git a/lovelace.txt b/lovelace.txt index 3d402d9..96478a0 100644 --- a/lovelace.txt +++ b/lovelace.txt @@ -1 +1,2 @@ On which year was Ada Lovelace born? + December 10, 1815 \ No newline at end of file diff --git a/other-file.txt b/other-file.txt index 4ba7042..1f16335 100644 --- a/other-file.txt +++ b/other-file.txt @@ -2,5 +2,5 @@ Congrats, you found the OTHER file! There's another question in this one, but I promise it's not too tricky! -Question: What is your favourite song? -Your answer: +Question: What is your favourite song? +Your answer: JAME Headfiled diff --git a/programming.txt b/programming.txt index f23b5d6..58761ce 100644 --- a/programming.txt +++ b/programming.txt @@ -1 +1,2 @@ Who wrote the book "The Art of Computer Programming" ? +"The Art of Computer Programming" was written by Donald Knuth \ No newline at end of file From f334f2adcb8242cdc63d08cbe11fc3e2859ae0f1 Mon Sep 17 00:00:00 2001 From: Armin Date: Sat, 5 Oct 2024 14:15:53 +0100 Subject: [PATCH 3/3] questions of meeting --- main.txt | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/main.txt b/main.txt index 7d8c459..c034a17 100644 --- a/main.txt +++ b/main.txt @@ -126,9 +126,80 @@ Date: Fri Oct 16 22:44:16 2020 +0100 c) What changes did illictonion make in the commit titled “Revert changes accidentally pushed in the past”? +commit 1994d4c85de940daf443ef77415a0bc004756999 (HEAD -> main, upstream/main, origin/main, origin/HEAD, armin/main) +Author: MitchLloyd +Date: Sat Aug 5 14:28:04 2023 +0100 + + Create javascript.txt + +commit 91322e912018a25b8a8e2ca159f93a2a35a2b5d4 +Author: MitchLloyd +Date: Sat Aug 5 14:26:22 2023 +0100 + + Create lovelace.txt + +commit 820ef13f6dcebc17deb076550b08a7b492b72197 +Author: MitchLloyd +Date: Sat Aug 5 14:23:55 2023 +0100 + + Create programming.txt + +commit e6827e958741e838be18041bb27a7d09c21239eb +Author: MitchLloyd +Date: Sat Aug 5 14:22:08 2023 +0100 + +: +commit 1994d4c85de940daf443ef77415a0bc004756999 (HEAD -> main, upstream/main, origin/main, origin/HEAD, armin/main) +Author: MitchLloyd +Date: Sat Aug 5 14:28:04 2023 +0100 + + Create javascript.txt + +commit 91322e912018a25b8a8e2ca159f93a2a35a2b5d4 +Author: MitchLloyd +Date: Sat Aug 5 14:26:22 2023 +0100 + + Create lovelace.txt + +commit 820ef13f6dcebc17deb076550b08a7b492b72197 +Author: MitchLloyd +Date: Sat Aug 5 14:23:55 2023 +0100 + + Create programming.txt + +commit e6827e958741e838be18041bb27a7d09c21239eb +Author: MitchLloyd +Date: Sat Aug 5 14:22:08 2023 +0100 d) How many files were added in the first commit? What were the names of the files? +commit 1994d4c85de940daf443ef77415a0bc004756999 (HEAD -> main, upstream/main, origin/main, origin/HEAD, armin/main) +Author: MitchLloyd +Date: Sat Aug 5 14:28:04 2023 +0100 + + Create javascript.txt + +commit 91322e912018a25b8a8e2ca159f93a2a35a2b5d4 +Author: MitchLloyd +Date: Sat Aug 5 14:26:22 2023 +0100 + + Create lovelace.txt + +commit 820ef13f6dcebc17deb076550b08a7b492b72197 +Author: MitchLloyd +Date: Sat Aug 5 14:23:55 2023 +0100 + + Create programming.txt + +commit e6827e958741e838be18041bb27a7d09c21239eb +Author: MitchLloyd +Date: Sat Aug 5 14:22:08 2023 +0100 + + Create capital.txt e) What is the hash for the first commit in the history? +commit 1994d4c85de940daf443ef77415a0bc004756999 (HEAD -> main, upstream/main, origin/main, origin/HEAD, armin/main) +Author: MitchLloyd +Date: Sat Aug 5 14:28:04 2023 +0100 + Create javascript.txt f) What is Claire Bickley’s favourite food? \ No newline at end of file