Skip to content

Latest commit

 

History

History
7 lines (6 loc) · 621 Bytes

README.md

File metadata and controls

7 lines (6 loc) · 621 Bytes

Git Merge Challenge

For some reason, this group is using Git to create a to-do list to track their work on a group presentation. Complete the following tasks to try out merging in Git.

Tasks

  • Alice created some slides on the potato war to test out a slide theme. Bob wants to revise and edit her work without committing Alice's changes to the main branch. Please merge Alice's branch onto Bob's so Bob can check her work.
  • Charles and Daniel have assigned the remaining sections of the presentation. But they disagree on who should do what! Merge Charles's branch onto Daniel's so we can sort out this whole mess!