vko05_harj.md

Back to the course mainpage

Back to week 5 theory material

Assignment 5

1. Do a branch to the repository called "Assignment5"
2. In the branch, update the file firstname_surname_studentnumber.md and commit your changes
3. Merge the Assignment5 branch to the master branch
4. Resolve possible conflict situations
5. Do a branch called feature1 and add feature1.md file to the branch
6. Add to the feature1.md file an investigation & documentation of some git command. Take screenshots when you use the command and describe its usage with your own words as text in the file. More of the commands e.g. (find more in https://git-scm.com/docs
   • git revert
   • git remote
   • git tag
   • git reset
   • git rebase
7. Merge the investigation (new feature) into the master branch
8. Resolve possible conflict situations in the Merger... if you want you can intentionally make a conflict if you want.
9. Finalize the issues and milestones of the repository. Close them. Remember to write /spend xh into the issues, that the spent time can be seen.
10. Return your repository by adding @sahka / Karo Saharinen to the project as a member

• Left under Settings -> Members
• Gitlab member or Email address field: @sahka or karo.saharinen@jamk.fi
• Choose a role permission: Maintainer
• Press Invite

11. Send an email to karo.saharinen@jamk.fi with the topic: "Gitlab-course returnal, firstname lastname studentnumber" (add your own information to firstname, lastname and studentnumber sections). If you want you can add the repository URL into the message just incase.
12. Fill the Course Feedback -form
13. Wait for me to check the returned repository and to give an grade in Peppi, thanks for participating!

• Be patient, I usually check these around every 2-3 weeks...

14. For CampusOnline students the grades should move as follows (dated 23.2.2022)
    • Here are instructions and knowledge from CampusOnline.fi pages concerning the transfer of study attainments https://campusonline.fi/en/transferring-study-attainments-between-universities-of-applied-sciences/ and a link to the instructions https://storage.googleapis.com/campusonline/53e9ee69-puro_en.pdf