From 928ec32c3a934a13b107fb0dceabb06278a5fe64 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 24 Oct 2025 10:08:32 -0400 Subject: [PATCH 1/9] Did exercise for read_input --- 01-read_input.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/01-read_input.sh b/01-read_input.sh index 438445b..bd37238 100644 --- a/01-read_input.sh +++ b/01-read_input.sh @@ -10,3 +10,7 @@ echo 'Your name was stored in $name' # exercise: write a script that asks the user for a # filename and create an empty file named after it + +echo "What would like to name your filename" +read filename +touch $filename.txt From 24b0be6e9e03f246931a04cb0ac116938fbbde85 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 24 Oct 2025 10:10:45 -0400 Subject: [PATCH 2/9] made 01-read_input add file to Desktop --- 01-read_input.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/01-read_input.sh b/01-read_input.sh index bd37238..0917a64 100644 --- a/01-read_input.sh +++ b/01-read_input.sh @@ -13,4 +13,6 @@ echo 'Your name was stored in $name' echo "What would like to name your filename" read filename +cd ~ +cd Desktop touch $filename.txt From 2aaecfe810a878f0cff5a02eb6afc262e0bb28d2 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 24 Oct 2025 10:18:34 -0400 Subject: [PATCH 3/9] Added my parallel png and remove other students. --- git_log_graph.png | Bin 0 -> 6397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 git_log_graph.png diff --git a/git_log_graph.png b/git_log_graph.png new file mode 100644 index 0000000000000000000000000000000000000000..52a2fc1b82501eb3b06ced8cb2a7c4acafbff844 GIT binary patch literal 6397 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 F{R`i> Date: Fri, 24 Oct 2025 10:20:20 -0400 Subject: [PATCH 4/9] deleted --- parallel.PNG | Bin 4109 -> 0 bytes post_merge.PNG | Bin 3653 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 parallel.PNG delete mode 100644 post_merge.PNG diff --git a/parallel.PNG b/parallel.PNG deleted file mode 100644 index 72e5f69549d3ca30812eb5b05ebc7902c8963fbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4109 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 Date: Fri, 24 Oct 2025 10:34:14 -0400 Subject: [PATCH 5/9] forcing merge conflict for part3 due to mistake --- 01-read_input.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/01-read_input.sh b/01-read_input.sh index 0917a64..06dc8e1 100644 --- a/01-read_input.sh +++ b/01-read_input.sh @@ -12,7 +12,5 @@ echo 'Your name was stored in $name' # filename and create an empty file named after it echo "What would like to name your filename" -read filename -cd ~ -cd Desktop -touch $filename.txt +read namefile +touch $namefile.txt From c3ae580776d9bce727156676749559578b8bf459 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 24 Oct 2025 10:42:24 -0400 Subject: [PATCH 6/9] merge conflict forceing --- .txt | 0 01-read_input.sh | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .txt diff --git a/.txt b/.txt new file mode 100644 index 0000000..e69de29 diff --git a/01-read_input.sh b/01-read_input.sh index 06dc8e1..ad0457d 100644 --- a/01-read_input.sh +++ b/01-read_input.sh @@ -11,6 +11,8 @@ echo 'Your name was stored in $name' # exercise: write a script that asks the user for a # filename and create an empty file named after it -echo "What would like to name your filename" -read namefile -touch $namefile.txt +echo "FILENAME USER WHAT IS IT?!?!" +read nameUSerGIVES +cd ~ +cd Desktop +touch $nameUSerGIVES.txt From 0596d6fdd1e5d7edc95e5c07485c2482b7f56ba1 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 24 Oct 2025 10:47:00 -0400 Subject: [PATCH 7/9] trying to merge conflict --- 01-read_input.sh | 6 +++--- carlos.txt | 0 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 carlos.txt diff --git a/01-read_input.sh b/01-read_input.sh index bd37238..9550f46 100644 --- a/01-read_input.sh +++ b/01-read_input.sh @@ -11,6 +11,6 @@ echo 'Your name was stored in $name' # exercise: write a script that asks the user for a # filename and create an empty file named after it -echo "What would like to name your filename" -read filename -touch $filename.txt +echo "NAME NAME NAME" +read Read +echo "merge conflict please $Read" diff --git a/carlos.txt b/carlos.txt new file mode 100644 index 0000000..e69de29 From dd6f4e086db18d7da6f008bb1332f949761dd556 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 24 Oct 2025 10:48:21 -0400 Subject: [PATCH 8/9] merge --- 01-read_input.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/01-read_input.sh b/01-read_input.sh index ad0457d..cd334ac 100644 --- a/01-read_input.sh +++ b/01-read_input.sh @@ -11,8 +11,8 @@ echo 'Your name was stored in $name' # exercise: write a script that asks the user for a # filename and create an empty file named after it -echo "FILENAME USER WHAT IS IT?!?!" -read nameUSerGIVES +echo "what is the filename you would give?" +read UserInput cd ~ cd Desktop -touch $nameUSerGIVES.txt +touch $nameInput.txt From f139bae615fd78099256461c2b122a8b7436217c Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 24 Oct 2025 10:52:50 -0400 Subject: [PATCH 9/9] after-merging png --- after-merging.png | Bin 0 -> 6153 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 after-merging.png diff --git a/after-merging.png b/after-merging.png new file mode 100644 index 0000000000000000000000000000000000000000..46b8f310441ac57d942e4eac5ffafb2f7c9b1c84 GIT binary patch literal 6153 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