Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New-branch #423

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion capital.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
What is the capital city of Slovenia?
What is the capital city of Slovenia?Ljubljana
3 changes: 2 additions & 1 deletion file.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions javascript.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
How old is the JavaScript programming language?
29 years old
1 change: 1 addition & 0 deletions lovelace.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
On which year was Ada Lovelace born?
December 10, 1815
205 changes: 205 additions & 0 deletions main.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
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 <[email protected]>
Date: Sat Oct 31 12:02:05 2020 +0000

blank answers

commit 7bceb9e17384aa19bff8446040903e7888c67749
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 11:59:13 2020 +0000

Update other-file.txt

commit 94872bf6152fde6cb01f0361879d02dc37ae38bd
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 11:54:06 2020 +0000

answrered questions

commit e508be650bd0ab2ab5bb3347e6b5bf1a561c276b
Author: Daniel Wagner-Hall <[email protected]>
Date: Fri Oct 16 22:44:16 2020 +0100

Initial commit
:...skipping...
commit 5cd51b2dbeff9bd21df2b2e902ee3f3ad4959978
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 12:02:05 2020 +0000

blank answers

commit 7bceb9e17384aa19bff8446040903e7888c67749
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 11:59:13 2020 +0000

Update other-file.txt

commit 94872bf6152fde6cb01f0361879d02dc37ae38bd
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 11:54:06 2020 +0000

answrered questions

commit e508be650bd0ab2ab5bb3347e6b5bf1a561c276b
Author: Daniel Wagner-Hall <[email protected]>
Date: Fri Oct 16 22:44:16 2020 +0100

Initial commit
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
~
(END)
commit 5cd51b2dbeff9bd21df2b2e902ee3f3ad4959978
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 12:02:05 2020 +0000

blank answers

commit 7bceb9e17384aa19bff8446040903e7888c67749
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 11:59:13 2020 +0000

Update other-file.txt

commit 94872bf6152fde6cb01f0361879d02dc37ae38bd
Author: Claire Bickley <[email protected]>
Date: Sat Oct 31 11:54:06 2020 +0000

answrered questions

commit e508be650bd0ab2ab5bb3347e6b5bf1a561c276b
Author: Daniel Wagner-Hall <[email protected]>
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”?
commit 1994d4c85de940daf443ef77415a0bc004756999 (HEAD -> main, upstream/main, origin/main, origin/HEAD, armin/main)
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:28:04 2023 +0100

Create javascript.txt

commit 91322e912018a25b8a8e2ca159f93a2a35a2b5d4
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:26:22 2023 +0100

Create lovelace.txt

commit 820ef13f6dcebc17deb076550b08a7b492b72197
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:23:55 2023 +0100

Create programming.txt

commit e6827e958741e838be18041bb27a7d09c21239eb
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:22:08 2023 +0100

:
commit 1994d4c85de940daf443ef77415a0bc004756999 (HEAD -> main, upstream/main, origin/main, origin/HEAD, armin/main)
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:28:04 2023 +0100

Create javascript.txt

commit 91322e912018a25b8a8e2ca159f93a2a35a2b5d4
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:26:22 2023 +0100

Create lovelace.txt

commit 820ef13f6dcebc17deb076550b08a7b492b72197
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:23:55 2023 +0100

Create programming.txt

commit e6827e958741e838be18041bb27a7d09c21239eb
Author: MitchLloyd <[email protected]>
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 <[email protected]>
Date: Sat Aug 5 14:28:04 2023 +0100

Create javascript.txt

commit 91322e912018a25b8a8e2ca159f93a2a35a2b5d4
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:26:22 2023 +0100

Create lovelace.txt

commit 820ef13f6dcebc17deb076550b08a7b492b72197
Author: MitchLloyd <[email protected]>
Date: Sat Aug 5 14:23:55 2023 +0100

Create programming.txt

commit e6827e958741e838be18041bb27a7d09c21239eb
Author: MitchLloyd <[email protected]>
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 <[email protected]>
Date: Sat Aug 5 14:28:04 2023 +0100

Create javascript.txt
f) What is Claire Bickley’s favourite food?
4 changes: 2 additions & 2 deletions other-file.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions programming.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Who wrote the book "The Art of Computer Programming" ?
"The Art of Computer Programming" was written by Donald Knuth