Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 52 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,55 @@ way home from work.
1. To get started, `fork` and `clone` this `repository`.

2. Look through our list of `branches` and try and `checkout` the right one! (More instructions will
appear in the version of the README.md file on each `branch`)
appear in the version of the README.md file on each `branch`)

---


Nice! You found the code with Ians story on it. Except, it doesn't look quite right... This isn't the _final_ version,
we decided to rollback to a previous version!

1. Check the `git log` commit history to find which commit holds the final copy of the story!

2. Use the git reset command to rollback the branch to that version of the story, something like `git reset --hard <commit reference>` should do!

Awesome work! let's find story number 2. This one is about Alex. Check out the Alex branch to continue with the tasks!


---

Great! You found the correct branch. Huh, it looks like the author of this story hadn't quite finished. The story is split into 3 parts.

1. Please create a new file called `alex_makes_friends.txt`.

2. Add the content from each of the existing files into the new one.

3. Remove the original 3 files.

4. Add a `commit` to this branch with the completed story.

Excellent! We have a story now! Oh wait, we should have 2 stories by now...

1. Create a new branch from this one called "all-silverbullet-stories".

2. `merge` the content of the `ians_bike_ride` into this one.

Yay! 2 stories! We need to fetch the content from the other story now, let's take a look at branch number 3!

=======
Well, it looks like someone was in a rush with this work...

1. Check the `git log` for the commit hash containing the poem, avoiding any other commits.

2. Please `cherry-pick` the commit from this branch containing the poem onto the "all-silverbullet-stories" branch,
leaving any other commits from this branch alone.

3. Check the README.md for more instructions.

---

Woohoo! You did it! All the stories are on the same branch, and we can update main now!

1. Push the "all-silverbullet-stories" `branch` to your `fork`.
2. Finally, please create a pull request to merge the "all-silverbullet-stories" branch into the main branch.

51 changes: 51 additions & 0 deletions alex_makes_friends.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
In the light of the day a little Alex lay at his desk.

One Monday Morning the coffee started to work...

and POP, up from the desk sat a very confused Alex.

He started looking for his belongings.
In January he looked for his pen. He could not find it.

In February he looked for his coffee cup. He could not find it.

In March he looked for his phone charger. He could not find it.

In April he looked for his notepad. He could not find it.

In May he looked for his coat. He could not find it.

In June he looked for his running shoes. He could not find them.

In July he looked for his wallet. He could not find it.

In August he looked for his house keys. He could not find them.

In September he looked for his vape. He could not find it.

In October he looked for his sunglasses. He could not find them.

In November he looked for his computer monitor. He could not find it.

In december he looked for his pickle. He could not find anything!
The next month was January again.

Alex was tired of searching, and asked everyone to help him find his things.

Everyone in the office snickered, and after that he felt worse.

Umberto took him to the office organisation shelf, and lo, sitting in a box, were all of his things!

Now he wasn't searching anymore, and he wasn't a mad, dirty, desk gremlin anymore.

He was a clean minimalist enthusiast.

He swept everything into the bin,

Including his mouldy shoes.

His desk stayed clean for more than two weeks.

Then we moved offices and...

He became a dirty desk gremlin again!
7 changes: 7 additions & 0 deletions ians_adventures.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Once upon a time in the bustling city of London, there lived a man named Ian who had a peculiar fondness for alcoholic drinks. Ian's love for gin knew no bounds, and he often found himself sipping on whimsical concoctions throughout the day. One sunny afternoon, however, Ian may have had a few too many fizzy delights, and he felt like a bubbly balloon floating in the air.

With a joyful heart and a funny tummy, Ian decided it was time to head home. Being a responsible fellow, he thought renting a bike was the perfect solution to navigate the winding streets of London. Little did Ian know, the delicious drinks had turned his sense of direction into a playful game of hide-and-seek.

As Ian pedaled through the enchanting streets, the world around him began to spin, and the once straight paths turned into delightful circles. Ian found himself riding in loops, giggling at the unexpected carousel he had created. The Silverbullet team watched from a tracking app in amazement as Ian's bicycle dance brought a touch of joy to London.

However, as the sun dipped below the horizon, Ian realized he had been riding in circles for far too long. With a chuckle and a hiccup, he decided it was time to bid farewell to his trusty two-wheeled companion. With a gentle pat on the bike's frame, Ian left it by the side of the road, continuing his journey on foot, leaving behind a handful of texts for Gemma, to straighten this whole thing out. And so, the tale of Ian's bicycle adventure and his swirly journey became a merry legend to all at Silverbullet.
29 changes: 29 additions & 0 deletions it_was_definitely_a_fart.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
In a gathering of suits and ties, so neat,
A meeting convened, oh, what a feat!
About information security, they spoke,
A topic quite serious, but not to evoke

Excitement or joy in the hearts of the crowd,
For the subject was dense, and voices were loud.
Slides full of jargon and endless data,
The atmosphere heavy, like a cold elevator.

Amidst the droning, a silence did break,
A sound unexpected, a minor earthquake.
A loud, abrupt toot disrupted the air,
An accidental symphony, a comedic affair.

Eyes darted around, in search of the source,
An innocent face, trying to stay on course.
Laughter erupted, a welcome release,
From the monotony, a moment of peace.

The meeting continued, a bit less mundane,
As giggles and whispers began to reign.
The flatulent symphony, a tale to be told,
A highlight in the meeting, a memory to hold.

So, in the midst of the boring and dry,
A simple fart made spirits soar high.
In the realm of infosec and corporate lore,
A meeting remembered forevermore.