Korusuke
commented
3 years ago It might look like a lot of changes were made, but I think it was because I had to download the files from a teammate's repo and then add it to my fork to be able to merge them. And my fork was older, from the beginning of the week.
Yeah it seems like the changes seen here are not only yours but of many more PRs, the sha's might have changed cause of some rebase or cherry picking operation.
To resolve this and the conflict with the master branch I recommend you to do a rebase with the root fork's master once.
Some useful links:
elleanne
It might look like a lot of changes were made, but I think it was because I had to download the files from a teammate's repo and then add it to my fork to be able to merge them. And my fork was older, from the beginning of the week.
Changes
Added a hobbies section.
How Has This Been Tested?
We ran it on our local machines using ruby and jekyll. Our Changes don't affect any other code. New files have been created (hobbies.html, hobbies.scss, and hobbies.yml).
Mentions
@TimmyCoder @Ali-Doggaz and @Eliboss are working on this. Our pod leader is @Korusuke.
Types of changes
Checklist