Task Instructions

Table of Contents

• Task A
• Task B
• Task C

Task A

Create a new branch originating from the current main branch:

dev/{xy}/workshop   // Replace {xy} with your initials, e.g., dev/bg/workshop

Replace the word "some" in the main.ps1 script with the name of your choice for the pizza. For the menu, see Bella Palma Menu.

Add a commit with the title:

chore(main): order my pizza

Ensure that the pipeline succeeds after making this change.

Verification

• Check that the pipeline runs successfully after pushing your branch.
• Confirm that the commit title matches the required format.

Task B

Adjust your dev branch to include all commits from the workshop-branch and then your own commit. Follow these steps:

1. Merge the commit titled "WIP fix errors" into the relevant commits. Use an interactive rebase to clean up the history.
2. Rename the commit titled feat(order): implement Send-Order to feat(order): implement Submit-Order.
3. Ensure the final order of commits is as follows:
   1. feat(order): implement Submit-Order
   2. chore(main): call Submit-Order with custom pizza
   3. refact(main): extract Get-Pizza
   4. chore(main): order my pizza

Verification

• Ensure there are no unnecessary commits in the history.
• Verify that the pipeline succeeds after pushing the updated branch.

Task C

Rebase your branch on top of the main branch (after the most recent push). Ensure that everything still works as expected. Resolve any conflicts that arise during the rebase process, and verify that the commit history remains clean and logical.

Apply the changes from the new main to the commits (e.g. outdated titles)

Verification

• Check that the branch is successfully rebased on top of main.
• Ensure the pipeline runs successfully after the rebase.
• Verify that all tasks and functionality remain intact.