sp24-lab1

Activity: Editing and merging via a branch and a pull request

Open up the pie.py file in the code editor in the GitHub browser:

1. Right click on the file name to open the file in a new tab, so you can still read these instructions.
2. Then click the pencil icon to edit the file.

Edit the file:

1. Read through the code and ask yourself: What does this code do? What will the outputs be?
2. Create a new Pie object that contains a different kind of pie.

Once you've made these changes, click "Commit changes..." and select "Create a new branch for this commit and start a pull request." Follow the directions to commit your changes.

What happens next?

• If you are able to merge your changes, go ahead and do so.

• If you are not able to merge your changes... why is this happening? What might you do to be able to manage any merge conflicts that arise?

Write your notes about what happened below (along with your name), by editing this README.md file.

...

Neel Troeger

1. This code creates a pie object in Python, which is a class with different fields for defining the name of a type of pie, the filling, and what the crust of the pie is made of.

I was able to merge the changes.

Uli Raudales

1. The code creates a Pie object using Python and has a init method that automatically inits the Pie name, filling and crust properties when a Pie class instance is called.

I was able to merge the changes

Grant Didway

• The code creates a Pie object. A Pie object by this definition has a name, filling and crust which are passed upon instantiation
• I was able to merge the changes

Gabriel Paris-Moe

1. created a Pie object and then initialized many different pie objects
2. yes I was able to merge

Jas Liu

1. created a pie object with a name, filling, and dough
2. yes i was able to merge

Clara Bates

1. The code creates a Pie object that has a name, filling, and crust.
2. I was able to successfully merge the changes.

Terence Mahlatini

1. The code creates a Pie object and I was able to add a new pie object, "Cherry", commit the change and successfully merge back to the main branch.

John Leeds

• I was able to successfully create a new pie (peach pie) and merge it into the main branch. There were no merge conflicts.