File for participant NICOLAS
this is a change and a second one.
This file is the main test file on which you will perform your exercises. A secondary file 'content.md' is used for exercises.
This file is the entry point for all your exercises. A secondary file
content.md is the file which you will need to change to actually perform the
exercises.
Switch to branch nicolas-main. Oh no, there is a typo (or should I say "typoo") in
the last commit! Amend the commit to correct the commit message.
Oh no again, we wanted to have two exclamation marks (!!) on in the content. Change the line in the content file to:
Hello world!!
Push all your changes to nicolas-main again.
Don't push as an extra commit! We only amended here, so there should only be the one commit with message
"fix: correct typoo in content for participant nicolas".
Merge branch nicolas-merge-branch into nicolas-main. Resolve any conflicts that might arise
by keeping the changes from nicolas-merge-branch.
Don't forget to push your changes.
Switch to branch nicolas-rebase-branch and rebase it onto nicolas-main. Resolve any
conflicts that might arise by keeping the changes from nicolas-rebase-branch.
Don't forget to push your changes.
The branch nicolas-rebase-branch should be 2 commits ahead of nicolas-main. Squash the two
commits into a single commit with message:
feat: beautify world and ask participant nicolas how (s)he is enjoying it
Don't forget to push your changes.
Damn, there is an amazing commit on branch nicolas-cherry-pick-branch with message:
feat: add content that should also be on nicolas-main
This should indeed also be on nicolas-main. Let's cherry-pick it onto main! Resolve
any conflicts that might arise by keeping the changes from nicolas-cherry-pick-branch.
And ... ...yup, don't forget to push your changes.
I think how that we merged nicolas-merge-branch into nicolas-main and added the amazing
commit from nicolas-cherry-pick-branch, we could go live with version 1.0.0!
Let's create a tag nicolas-v1.0.0 on the last commit on nicolas-main and push it to the
remote.
Now it's your time to show your Markdown skillz. Switch to branch nicolas-rebase-branch
and modify content.md by adding whether you are a cat or a dog person, then
commit it, but don't push!
Ahhhhhh, turns out being a cat or dog person is sensitive information, let's
hard reset back to the status of nicolas-rebase-branch that is on the remote.
You should be on branch
nicolas-rebase-branch.
Mhhh maybe we could add less sensitive information, like the meaning of life.
Add a line to content.md that says:
The answer to the meaning of life, the universe, and everything is ...
Ahhh you don't get time to find the answer to it, and a colleague asks you to
review his code on branch nicolas-life. Stash your changes for later, and have a
look at the nicolas-life branch. Once you have had a look, go back to
nicolas-rebase-branch and finish your line, commit the changes, and push them.