Skip to content

Will branch #2

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.

Sign up for GitHub

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

Open
Will-Marriott wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Will branch #2

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b394a01
final paragraph
Will-Marriott Aug 15, 2023
014cd44
Adding first two paragraphs to the story
aliharis99 Aug 15, 2023
56b1231
added middle section
alaws-scottlogic Aug 15, 2023
d965190
Merge pull request #1 from Will-Marriott/Haris-Branch
aliharis99 Aug 15, 2023
9000a61
final paragraph
Will-Marriott Aug 15, 2023
9b74db8
merged and added next sentences
alaws-scottlogic Aug 15, 2023
93869a9
Merge pull request #2 from Will-Marriott/amy-branch
Will-Marriott Aug 15, 2023
1f77cbf
added final paragraph
Will-Marriott Aug 15, 2023
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
14 changes: 13 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
# git-workshop-3
# git-workshop-3
There once was a man named Mickey Who grew lots of weed that was sticky He wanted to sell his empire But that sparked a lot of fire From gangsters and thugs who were tricky

They tried to blackmail and bribe him They tried to rob and outsmart him But Mickey was clever and tough He knew how to deal with their bluff He had his loyal Ray to guide him

He also had his wife Rosalind Who ran a garage and could fend She helped him fight off the bad guys With her wit and her guns as allies She was his partner till the end

But who was the one telling this tale? It was Fletcher, a sneaky blackmailer He had a screenplay called Bush That he hoped to sell for some cash But he ended up in a container

Mickey managed to keep his domain
And made a deal with Berger, the American
He got his money and his peace And his weed business did not cease
He remained the gentleman of London