From 7981593bf3465a20624fe159ab5e04a84de2d684 Mon Sep 17 00:00:00 2001 From: onlydurodola Date: Fri, 13 Mar 2026 19:26:24 +0100 Subject: [PATCH 01/10] testing conflicts --- new | 1 + new.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 new create mode 100644 new.txt diff --git a/new b/new new file mode 100644 index 0000000..1874031 --- /dev/null +++ b/new @@ -0,0 +1 @@ +labalaba diff --git a/new.txt b/new.txt new file mode 100644 index 0000000..1874031 --- /dev/null +++ b/new.txt @@ -0,0 +1 @@ +labalaba From 4e90ca23665e70888ea5a6f4f0b43907420dd431 Mon Sep 17 00:00:00 2001 From: onlydurodola Date: Fri, 13 Mar 2026 19:27:36 +0100 Subject: [PATCH 02/10] test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 35d2793..a152cc4 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ Git Class +Praise God From 738946518905fe68e55dfbe0ba4b31de31b3333e Mon Sep 17 00:00:00 2001 From: onlydurodola Date: Fri, 13 Mar 2026 19:28:07 +0100 Subject: [PATCH 03/10] testing conflicts. --- news.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 news.txt diff --git a/news.txt b/news.txt new file mode 100644 index 0000000..1874031 --- /dev/null +++ b/news.txt @@ -0,0 +1 @@ +labalaba From 0212b9ededa75fa20824ec919fb00214fad37c36 Mon Sep 17 00:00:00 2001 From: Daniel Aji Musa <133120351+Danaji20@users.noreply.github.com> Date: Mon, 23 Mar 2026 15:05:38 +0100 Subject: [PATCH 04/10] simulating push before pull oh --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d73cf2..8cc9256 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ Git Class -simulating a push before pull +simulating a push before pull oh From 62f3783f26dbefcdb65f37b4a038644081fbf16e Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 23 Mar 2026 15:23:28 +0100 Subject: [PATCH 05/10] initial commit by danny --- dan | 7 +++++++ dan.pub | 1 + hello.md | 0 iron.js | 2 ++ iron.js.3.7.26 | 2 ++ new | 1 + new.txt | 1 + status1.gh | 0 status10.gh | 0 status11.gh | 0 status12.gh | 0 status13.gh | 0 status14.gh | 0 status15.gh | 0 status16.gh | 0 status17.gh | 0 status18.gh | 0 status19.gh | 0 status2.gh | 0 status20.gh | 0 status3.gh | 0 status4.gh | 0 status5.gh | 0 status6.gh | 0 status7.gh | 0 status8.gh | 0 status9.gh | 0 waiting.py | 0 28 files changed, 14 insertions(+) create mode 100644 dan create mode 100644 dan.pub create mode 100644 hello.md create mode 100644 iron.js create mode 100644 iron.js.3.7.26 create mode 100644 new create mode 100644 new.txt create mode 100644 status1.gh create mode 100644 status10.gh create mode 100644 status11.gh create mode 100644 status12.gh create mode 100644 status13.gh create mode 100644 status14.gh create mode 100644 status15.gh create mode 100644 status16.gh create mode 100644 status17.gh create mode 100644 status18.gh create mode 100644 status19.gh create mode 100644 status2.gh create mode 100644 status20.gh create mode 100644 status3.gh create mode 100644 status4.gh create mode 100644 status5.gh create mode 100644 status6.gh create mode 100644 status7.gh create mode 100644 status8.gh create mode 100644 status9.gh create mode 100644 waiting.py diff --git a/dan b/dan new file mode 100644 index 0000000..61d8d9a --- /dev/null +++ b/dan @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACB7EbIKGdaaufZEzzY7ZqK+CgJxw9VMNJI9H9dkpxjNpAAAAJjD6goXw+oK +FwAAAAtzc2gtZWQyNTUxOQAAACB7EbIKGdaaufZEzzY7ZqK+CgJxw9VMNJI9H9dkpxjNpA +AAAEB6zlrVdZ2g3KsqRJ4E+x7o36u3PSFTOJgTVblQ8CJlKHsRsgoZ1pq59kTPNjtmor4K +AnHD1Uw0kj0f12SnGM2kAAAAFXRhbGsyYWppamltQGdtYWlsLmNvbQ== +-----END OPENSSH PRIVATE KEY----- diff --git a/dan.pub b/dan.pub new file mode 100644 index 0000000..da396e8 --- /dev/null +++ b/dan.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHsRsgoZ1pq59kTPNjtmor4KAnHD1Uw0kj0f12SnGM2k talk2ajijim@gmail.com diff --git a/hello.md b/hello.md new file mode 100644 index 0000000..e69de29 diff --git a/iron.js b/iron.js new file mode 100644 index 0000000..16783cf --- /dev/null +++ b/iron.js @@ -0,0 +1,2 @@ +how are you? +aji diff --git a/iron.js.3.7.26 b/iron.js.3.7.26 new file mode 100644 index 0000000..16783cf --- /dev/null +++ b/iron.js.3.7.26 @@ -0,0 +1,2 @@ +how are you? +aji diff --git a/new b/new new file mode 100644 index 0000000..e1f14da --- /dev/null +++ b/new @@ -0,0 +1 @@ +na aji work be this oh diff --git a/new.txt b/new.txt new file mode 100644 index 0000000..e1f14da --- /dev/null +++ b/new.txt @@ -0,0 +1 @@ +na aji work be this oh diff --git a/status1.gh b/status1.gh new file mode 100644 index 0000000..e69de29 diff --git a/status10.gh b/status10.gh new file mode 100644 index 0000000..e69de29 diff --git a/status11.gh b/status11.gh new file mode 100644 index 0000000..e69de29 diff --git a/status12.gh b/status12.gh new file mode 100644 index 0000000..e69de29 diff --git a/status13.gh b/status13.gh new file mode 100644 index 0000000..e69de29 diff --git a/status14.gh b/status14.gh new file mode 100644 index 0000000..e69de29 diff --git a/status15.gh b/status15.gh new file mode 100644 index 0000000..e69de29 diff --git a/status16.gh b/status16.gh new file mode 100644 index 0000000..e69de29 diff --git a/status17.gh b/status17.gh new file mode 100644 index 0000000..e69de29 diff --git a/status18.gh b/status18.gh new file mode 100644 index 0000000..e69de29 diff --git a/status19.gh b/status19.gh new file mode 100644 index 0000000..e69de29 diff --git a/status2.gh b/status2.gh new file mode 100644 index 0000000..e69de29 diff --git a/status20.gh b/status20.gh new file mode 100644 index 0000000..e69de29 diff --git a/status3.gh b/status3.gh new file mode 100644 index 0000000..e69de29 diff --git a/status4.gh b/status4.gh new file mode 100644 index 0000000..e69de29 diff --git a/status5.gh b/status5.gh new file mode 100644 index 0000000..e69de29 diff --git a/status6.gh b/status6.gh new file mode 100644 index 0000000..e69de29 diff --git a/status7.gh b/status7.gh new file mode 100644 index 0000000..e69de29 diff --git a/status8.gh b/status8.gh new file mode 100644 index 0000000..e69de29 diff --git a/status9.gh b/status9.gh new file mode 100644 index 0000000..e69de29 diff --git a/waiting.py b/waiting.py new file mode 100644 index 0000000..e69de29 From 67758ad2c5e9eb21637313e4fb64d0d0a1c6a894 Mon Sep 17 00:00:00 2001 From: Daniel Aji Musa <133120351+Danaji20@users.noreply.github.com> Date: Mon, 23 Mar 2026 16:32:39 +0100 Subject: [PATCH 06/10] Remove SSH public key Replaced SSH public key with 'no key'. --- dan.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dan.pub b/dan.pub index da396e8..ea87737 100644 --- a/dan.pub +++ b/dan.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHsRsgoZ1pq59kTPNjtmor4KAnHD1Uw0kj0f12SnGM2k talk2ajijim@gmail.com +no key From 14d87cba3a9bc557730ca6b2f4c9616874620afb Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 23 Mar 2026 16:38:04 +0100 Subject: [PATCH 07/10] removing pub --- .gitignore | 1 + dan | 7 ------- dan.pub | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) create mode 100644 .gitignore delete mode 100644 dan diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..690bae0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +id_rsa diff --git a/dan b/dan deleted file mode 100644 index 61d8d9a..0000000 --- a/dan +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACB7EbIKGdaaufZEzzY7ZqK+CgJxw9VMNJI9H9dkpxjNpAAAAJjD6goXw+oK -FwAAAAtzc2gtZWQyNTUxOQAAACB7EbIKGdaaufZEzzY7ZqK+CgJxw9VMNJI9H9dkpxjNpA -AAAEB6zlrVdZ2g3KsqRJ4E+x7o36u3PSFTOJgTVblQ8CJlKHsRsgoZ1pq59kTPNjtmor4K -AnHD1Uw0kj0f12SnGM2kAAAAFXRhbGsyYWppamltQGdtYWlsLmNvbQ== ------END OPENSSH PRIVATE KEY----- diff --git a/dan.pub b/dan.pub index da396e8..ea87737 100644 --- a/dan.pub +++ b/dan.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHsRsgoZ1pq59kTPNjtmor4KAnHD1Uw0kj0f12SnGM2k talk2ajijim@gmail.com +no key From f784ca6303b60a74ab604545b901ea710a891ded Mon Sep 17 00:00:00 2001 From: Daniel Aji Musa <133120351+Danaji20@users.noreply.github.com> Date: Mon, 23 Mar 2026 16:50:29 +0100 Subject: [PATCH 08/10] Add feedback request to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8cc9256..2d035a4 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ Git Class simulating a push before pull oh +boss what do you think? From 4d1f0272ec54a7be1c03502aa8dad5bfae3355c3 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 23 Mar 2026 16:54:46 +0100 Subject: [PATCH 09/10] testing removing files --- dan.pub | 1 - new | 5 ----- new.txt | 5 ----- 3 files changed, 11 deletions(-) delete mode 100644 dan.pub delete mode 100644 new delete mode 100644 new.txt diff --git a/dan.pub b/dan.pub deleted file mode 100644 index ea87737..0000000 --- a/dan.pub +++ /dev/null @@ -1 +0,0 @@ -no key diff --git a/new b/new deleted file mode 100644 index 941b9e7..0000000 --- a/new +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -na aji work be this oh -======= -labalaba ->>>>>>> 0212b9ededa75fa20824ec919fb00214fad37c36 diff --git a/new.txt b/new.txt deleted file mode 100644 index 941b9e7..0000000 --- a/new.txt +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -na aji work be this oh -======= -labalaba ->>>>>>> 0212b9ededa75fa20824ec919fb00214fad37c36 From 1c2048f66791a1753f31569c5d78ac7526e9db27 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 23 Mar 2026 17:14:55 +0100 Subject: [PATCH 10/10] on new branch --- .news.txt.swp | Bin 0 -> 1024 bytes news.txt | 1 + 2 files changed, 1 insertion(+) create mode 100644 .news.txt.swp diff --git a/.news.txt.swp b/.news.txt.swp new file mode 100644 index 0000000000000000000000000000000000000000..f8db37780f40559b3684ddee7fca7607ff3d293c GIT binary patch literal 1024 zcmYc?$V<%2S1{7E)H7y40@Iio7*Z1RkVJ4ZU5HetpOK%Nst+_(zoa-ZIWZ+Qw^Bbn kvm`z_C$YF#KQFbsSg)j_1h+k-GNU0d8UhrBKq$Iy075+#6951J literal 0 HcmV?d00001 diff --git a/news.txt b/news.txt index 1874031..aaf1f5f 100644 --- a/news.txt +++ b/news.txt @@ -1 +1,2 @@ labalaba +on a new branch