You are tasked to implement function that can print the values of an array and return the sum! This function has the name printValuesAndReturnSum. You must implement this function using a for loop.
Create a branch called PersonB. To do this, while on the master branch, run git checkout -b PersonB. What this does is create a branch called PersonB and switches to that branch. If you run git status again, you should see the first line say On branch PersonB.
Edit the method printValuesAndReturnSum in the file Test1.java. Print out the values of the passed in int array and return the sum of all the values. It is mandatory for you to use a for loop to iterate through the array
Once you finish making the changes and ensure that your implementation is correct, use the terminal to add the file, commit with a meaningful message, and finally push. The first time you push, Git will tell you to run another command. For the first push from a branch, you will run git push --set-upstream origin PersonB. This command esssentially creates this branch in GitHub, the central repository, for you.
Now on if you refresh your GitHub web view, you should see this dialog pop up. The name of the branch in the picture may be different:
If you don't see this dialog, click on the Pull requests tab near the top of the page -> New pull request -> leave base as master but set compare to the branch you just pushed.
Go ahead and create the pull request and merge the pull request into master. There shouldn't be a merge conflict here.
Wait until your partner completes step 1A.
Your partner has completed this method using if-elseif-else logic on their own branch. Surprise! However, management has decided that this needs to be implemented using switch-cases. Your job now is to change the method's implementation to use a switch statement instead. On branch PersonB, the method basicCalculator should be empty already (remember, your partner's implementation is only on their branch)!
The method basicCalculator takes in an operator and two numbers and returns a result based on that operator. Keep in mind that the operator is an Enum. The values of the enum are: ADD, SUBTRACT, MULTIPLY, DIVIDE. If you are unsure how to do enum comparisons feel free to look on Google. You must implement this method with a switch-case.
Once you finish making the changes and ensure that your implementation is correct, use the terminal to add the file, commit with a meaningful message, and then push. Since you've pushed in a previous step, you would not have to run the git push --set-upstream... command. Instead, you can just run git push.
Now on if you refresh your GitHub web view again, you should see this dialog pop up. The name of the branch in the picture may be different:
If you don't see this dialog, click on the Pull requests tab near the top of the page -> New pull request -> leave base as master but set compare to the branch you just pushed.
Go ahead and create the pull request. There should now be a merge conflict!!
On the top of the Pull Request page you should see this the message Cannot automatically merge.
This image tells you that Git cannot automatically merge. This means that you need to tell Git which lines to keep and which lines to remove.
Give your pull request a detailed title, and click the green button Create pull request.
Now you should see a dialog telling you that This branch has conflicts that must be resolved.
Go ahead and click Resolve Conflicts
Now you will be brought to a screen that looks like a text editor. In your code you should see lines like <<<<<PersonB, =====, and >>>>>>master. These messages indicate the conflict. The lines of code under <<<<<<PersonB and between ===== indicates the incoming code. The lines after ====== and before >>>>>master indicates the lines currently in master
To "choose" your code, remove the code from master, as well as those lines added by Git (like <<<<<PersonB). Essentially you want your code to look like what it looked like in IntelliJ. Once the conflicts are resolved, GitHub will tell you by placing a green check mark next to the file name
Note: you can also resolve merge conflicts using git commands and your own text editor
Now you can click Mark as Resolved on the top right and then click Commit Merge.
Now you will be brought back to the pull request screen and the Merge pull request button should now be green.
Now you can click Confirm merge. If you go to the commit history on GitHub, you should be able to see your merging commit.
Congratulations! You have succesfully resolved a merge conflict!
Person B is now done with the hw. Please see final step once Person A is finished