From 4e4225e3fa2dc6a8bbffecf667258e35186128ac Mon Sep 17 00:00:00 2001 From: vali2wd Date: Sat, 9 Nov 2024 20:05:19 +0200 Subject: [PATCH 1/6] PR Gets merged --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index af23184..9bc95a1 100644 --- a/main.py +++ b/main.py @@ -1,4 +1,4 @@ s = 'nothing' - +# PR gets merged print('\nThis is our haiku:\n') print(s) From ce05b3e7e57ed1ca208c336a29d9e6d8cbc99dd1 Mon Sep 17 00:00:00 2001 From: vali2wd Date: Sat, 9 Nov 2024 20:23:20 +0200 Subject: [PATCH 2/6] .gitignore udpate after pr --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bee8a64..08e511d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ __pycache__ +/.vs From 10a48b9e99c2073238ddfad48fcfd2c54bd19aa3 Mon Sep 17 00:00:00 2001 From: vali2wd Date: Sat, 9 Nov 2024 20:23:44 +0200 Subject: [PATCH 3/6] another pr gets merged --- main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/main.py b/main.py index 9bc95a1..455e27c 100644 --- a/main.py +++ b/main.py @@ -1,4 +1,5 @@ s = 'nothing' # PR gets merged +# another pr gets merged print('\nThis is our haiku:\n') print(s) From d464a2a3bcd6c959f767a11d387b185e03b8381e Mon Sep 17 00:00:00 2001 From: vali2wd Date: Sat, 9 Nov 2024 20:29:16 +0200 Subject: [PATCH 4/6] FIrst PR --- main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.py b/main.py index 455e27c..1fe5882 100644 --- a/main.py +++ b/main.py @@ -3,3 +3,6 @@ # another pr gets merged print('\nThis is our haiku:\n') print(s) + +#new sprint +#first PR From a0e9a606495f82edc33b87ffcca69069916d584a Mon Sep 17 00:00:00 2001 From: vali2wd Date: Sat, 9 Nov 2024 20:30:39 +0200 Subject: [PATCH 5/6] Second PR --- main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/main.py b/main.py index 1fe5882..fcfd97d 100644 --- a/main.py +++ b/main.py @@ -6,3 +6,4 @@ #new sprint #first PR +#second PR \ No newline at end of file From 9287057cc67ae556273ceb6a23680b4ff2e29872 Mon Sep 17 00:00:00 2001 From: vali2wd Date: Sat, 9 Nov 2024 20:30:21 +0200 Subject: [PATCH 6/6] This is approved by me and I think this should go ONLINE. --- main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index fcfd97d..9ad0197 100644 --- a/main.py +++ b/main.py @@ -6,4 +6,7 @@ #new sprint #first PR -#second PR \ No newline at end of file +#second PR + +# i branch from main and start working +#its time to send \ No newline at end of file