search

fossbarrow / ultimate-seo-checklist

The ultimate SEO Checklist made by people all around the globe
36 stars 32 forks source link

Added Lists to the HTMLElements directory #16

Closed oyakhilomee closed 4 years ago

oyakhilomee commented 4 years ago

I added a List section to the HTMLElements directory and made notes on why it is important for SEO.

PatricNox commented 4 years ago

Hello!

Thank you so much for your contribution, this is one of the best ones so far!

feel free to contribute with more useful stuff here or visit https://github.com/fossbarrow for other repositories to contribute to!

Unfortunately, I cannot merge this at this state as there's unresolved merge conflicts. Please do fix them and push the commit, and I'll merge this PR!

oyakhilomee commented 4 years ago

@PatricNox would you please direct me on how I can resolve the conflict or go about finding where to resolve it.

Thanks and I'll definitely love to contribute more. Thanks for rejecting the first one 😄

oyakhilomee commented 4 years ago

why is it marking the header tag section? I didn't contribute that part.

PatricNox commented 4 years ago

Since the same lines.

oyakhilomee commented 4 years ago

I don't understand?

PatricNox commented 4 years ago

@oyakhilomee Your added lines is conflicting with some lines that someone else have added just before your PR. You can solve the conflict by simply keeping both tracks.

https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line

PatricNox commented 4 years ago

Hello @oyakhilomee, I've fixed the merge conflict for you.

Thanks for your addition and remember to visit https://github.com/fossbarrow for other repositories to contribute to!

oyakhilomee commented 4 years ago

Thanks @PatricNox but I was wondering if you had the time to show me how you fixed the conflict if you don't mind?

Can I dm you on Twitter?

PatricNox commented 4 years ago

@oyakhilomee I used github's merge conflict handler, and simply kept all incoming changes whilst moving your addition to the end of file section.

For practice, I recommend using an editor such as VSCode since it will help you dramatically.