search

sgs006 / Udacity-Yearbook-Project

Optional Yearbook Collaboration for Udacity Front-End Scholarship Participants
41 stars 39 forks source link

updating Yearbook page #88

Closed dominicbales closed 6 years ago

dominicbales commented 6 years ago

Update includes a list of all students on yearbook page along with the option to search for students by name

sgs006 commented 6 years ago

I am definitely not sure how to resolve these conflicts. Can anyone take a look?

dominicbales commented 6 years ago

Whenever my laptop finish repairing Ill take a look. Might have to refork your code with the new updated commits that you just added and than have leafdragon make another commit to my fork, or have leafdragon just make a pull request straight to your code

sgs006 commented 6 years ago

Thanks!

jamesperrin commented 6 years ago

Okay, I went through the PR and the yearbook.html file line-by-line.

@SoteroX you will need to update your files, it doesn't match yours exactly, but it has all your functionality.

Everyone else, you need to update your versions, this will eliminate further conflicts. Tip: Each time you sit down to work, you should check your local working files match the main repository.

Thanks, JP

dominicbales commented 6 years ago

What would be the best way to update?

dominicbales commented 6 years ago

Would it be with git fetch upstream

jamesperrin commented 6 years ago

I always use these commands. (Thanks @beckybair )

git fetch upstream
git merge upstream/master

You can see the updates live: https://jamesperrin.github.io/Udacity-Yearbook-Project/yearbook.html