-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Renamed more certificate to match challenge names. Moved Algorithm Pe… #8018
Conversation
…formance article to Algorithms section
Deploy preview for guide ready! Built with commit 22069f1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @iabrenne Thank you for all of your recent contributions. I'd like to be able to review and potentially merge these changes however you currently have merge conflict. I am unsure if PR#8026 replaces this pull request or if you'd like to resolve the merge conflict and I review this PR. Let me know how you'd like to proceed. Thanks for contributing :-)
When using GitHub do you use a text editor and Git on Desktop or are you using GitHub's web interface. If you are using the web interface I will have to clone your fork and fix for you. Thanks in advance :) |
@nsuchy - I am using text editor and git on the command line. I'd be happy to fix it if you guide me through what I need to do. Thank you! |
@iabrenne Awesome, so if you aren't using something like Atom or VS Code that does this for you you'll have to go by command line which can get tricky but once you get the hang of it it's a valueable still to have. I'm assuming you've never resolved a merge conflict before. To simplify what happened you've requested to change a line of code, afterwards someone else changed that same line of code, you'll have to review both lines and select which version of the line you'd like to keep. You should be able to run I know was a lot to read, look it over and let me know if you're still confused and I'll try to help :) I recommend reviewing the following resources for a further understanding: |
I'm addressing these merge conflicts myself for the sake of expedience.
@iabrenne Thanks for opening this PR. I'll take care of these conflicts and get this merged so we can keep moving. :) |
Renamed more articles in the certificates section to match the name of the corresponding challenge. Also moved Algorithm Performance articles from certificates to the algorithms section.
This would be a partial contribution for 16388.
✅️ By submitting this PR, I have verified the following
Update index.md
since it does not help the maintainer understand what has been changed.CONTRIBUTING.md
.