Advanced Git Workshop

• Slides: https://docs.google.com/presentation/d/1oy3kYqTL24iTu7IxRGi1_E0yyK1898oVDm80w1uaW0U
• Zoom: https://ufl.zoom.us/my/WillBAnders

Workshop 2A

One of your team members has started work on Issue #1, implementing the custom_sqrt function. They have opened Pull Request #2 for these changes, however in code review you notice their work doesn't meet the Git Workflow standards for your company. Using history rewrites, help them update their PR.

You will need to decide what to do to improve the PR using what we've discussed in Part 1 (slides above). Likewise, you will need to determine what commands are needed to rewrite history (multiple approaches work).

Hint 1

You can choose between combining both commits into a single one (easier) or rewriting both commits individually (harder, but more accurate).

Hint 2

For combining both commits, the easiest way is through git revert and then creating an entirely new commit. To keep them separate, try git rebase -i (interactive mode).

Workshop 2B

During your code review, another team member created and merged a PR that conflicts with your code. Resolve the merge conflict.

Hint

You can either use a rebase (preferred) or merge commit for this.