Closed dominicbales closed 6 years ago
I am definitely not sure how to resolve these conflicts. Can anyone take a look?
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
Thanks!
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
What would be the best way to update?
Would it be with git fetch upstream
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
Update includes a list of all students on yearbook page along with the option to search for students by name