From 75790957377ea778919057bf56665fb265ba98a9 Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 14:18:15 -0500 Subject: [PATCH 01/11] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index dc3f0da..506461a 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,6 @@ Then, the initialization is as follows: ``` git clone https://github.com/(your github username)/git_tutorial ``` -4. Type: git remote add origin https://github.com/(your github username)/git_tutorial (this connects your local folder to this Github repository) - # The Basics From ac42f10a630cb4235af50fa92778f6566a461eb7 Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 14:38:32 -0500 Subject: [PATCH 02/11] add test_value file --- test_value.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 test_value.py diff --git a/test_value.py b/test_value.py new file mode 100644 index 0000000..a7698e4 --- /dev/null +++ b/test_value.py @@ -0,0 +1,4 @@ +# call this file test_value.py + +def test_value(): + assert 1 <= 3 \ No newline at end of file From 2c7138d81d49fd1fe4f6edef6cf4b6c37f8cd5f6 Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 14:41:09 -0500 Subject: [PATCH 03/11] so much better --- test_value.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test_value.py b/test_value.py index a7698e4..acc0979 100644 --- a/test_value.py +++ b/test_value.py @@ -1,4 +1,6 @@ # call this file test_value.py def test_value(): - assert 1 <= 3 \ No newline at end of file + assert 1 <= 3 + + From b6acd42b572aed2f6772a162089835619629458a Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:15:54 -0500 Subject: [PATCH 04/11] This branch is woozy --- test_value.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_value.py b/test_value.py index acc0979..b20866b 100644 --- a/test_value.py +++ b/test_value.py @@ -1,6 +1,6 @@ # call this file test_value.py def test_value(): - assert 1 <= 3 + assert 1 <= 1000 From 1d91b32a03eec01837caaf2606d9f842d89e4fac Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:18:58 -0500 Subject: [PATCH 05/11] this branch is going TOO FAR --- test_value.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_value.py b/test_value.py index b20866b..531c71f 100644 --- a/test_value.py +++ b/test_value.py @@ -1,6 +1,6 @@ # call this file test_value.py def test_value(): - assert 1 <= 1000 + assert 1 <= 1000000 From 011b22d99f2dbf24f425fa00f7a17e6d9ce981d7 Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:23:16 -0500 Subject: [PATCH 06/11] this branch is now actually bad --- test_value.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_value.py b/test_value.py index 531c71f..5851f1e 100644 --- a/test_value.py +++ b/test_value.py @@ -1,6 +1,6 @@ # call this file test_value.py def test_value(): - assert 1 <= 1000000 + assert 5 <= 1 From e032f21c820489deebb676380a402215fa29905a Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:24:10 -0500 Subject: [PATCH 07/11] i fixed that naughty branch --- test_value.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_value.py b/test_value.py index 5851f1e..04f4bfc 100644 --- a/test_value.py +++ b/test_value.py @@ -1,6 +1,6 @@ # call this file test_value.py def test_value(): - assert 5 <= 1 + assert 5 <= 50 From 1cce84727d12488b7efd55521afb7e1cd5a27400 Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:25:12 -0500 Subject: [PATCH 08/11] I keep making it worse --- test_value.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_value.py b/test_value.py index 5851f1e..6921faa 100644 --- a/test_value.py +++ b/test_value.py @@ -1,6 +1,6 @@ # call this file test_value.py def test_value(): - assert 5 <= 1 + assert 5 <= -5 From 55b8193da39022bb50460a1446dc3b1bd61d8448 Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:27:18 -0500 Subject: [PATCH 09/11] I made something strange --- strange.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 strange.py diff --git a/strange.py b/strange.py new file mode 100644 index 0000000..e69de29 From 5eb6b324fba984e92db646407cae5c7234426da0 Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:28:42 -0500 Subject: [PATCH 10/11] this flower is beautifl --- flower.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 flower.py diff --git a/flower.py b/flower.py new file mode 100644 index 0000000..e69de29 From 3f17f24957a7062111213e766267b89f9a98106c Mon Sep 17 00:00:00 2001 From: Jackson Loper Date: Wed, 17 Nov 2021 15:30:23 -0500 Subject: [PATCH 11/11] with a magic merge, i fixed that naughty branch --- test_value.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_value.py b/test_value.py index 6921faa..04f4bfc 100644 --- a/test_value.py +++ b/test_value.py @@ -1,6 +1,6 @@ # call this file test_value.py def test_value(): - assert 5 <= -5 + assert 5 <= 50