Skip to main content

Achievements Round 1 Git

Weight: 10%

Due:

Marking Rubric

Achievements will be marked differently than other Assignments in Brightspace:

  • You will be graded for 2 5-point mini-assignments (Achievements) that will be due on Friday October 14
  • In Brightspace, you will receive points for Achievements Round 1 as you submit individual Achievements;
  • You can choose from any of the following Achievements for this Round;
  • You will be graded according to the Requirements of the Achievement you’ve submitted;

Achievements

Resolve Multiple Merge Conflicts

Practice resolving merge conflicts. These can be from actual instances in projects or you can create them on your own in a dedicated repo.

Instructions

To receive marks you must:

  1. Pick at least 1 repo where you resolved merge conflicts (starting on october 6th and it cannot be your CPNT-201-A3 repo)
  2. Resolve 5 merge conflicts following the instructions from class and assignment 3.
  3. In Brightspace submit links to all the merge conflicts commits along with a brief description of the commit.
  4. Submit a link to your repo

Merge work from a “development” branch into main

It is often good practice to open pull requests to move code to a main branch. Practice opening pull requests to move code into your main branch. Make use of the squash and merge option where appropriate.

  • This must include 5 commits in 1 or more pull requests

Instructions

  1. Open up a new branch with git checkout -b branch-name and make changes to your code in it
  2. Push the changes to the remote branch
  3. Open a pull request and merge the code into your main branch
  4. In your brightspace submission, add a link to your pull request

Use git revert, git reset, and git rm

  • Tutorials
  • Remove a file with git rm
  • Use git revert to undo changes
  • Use git reset to undo changes
  • Add a list with the commit history of the relevant changes
    • Bonus point if the changes are tracked in a Pull Request

Do any of the above achievements with a partner

  • Both of you will submit relevant information just like cpnt-201-a3.
  • You cannot do the same achievement twice