Skip to content
This repository has been archived by the owner on Aug 28, 2019. It is now read-only.

Renamed more certificate to match challenge names. Moved Algorithm Pe… #8018

Merged
merged 1 commit into from
Feb 23, 2018

Conversation

iabrenne
Copy link
Contributor

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

  • [] Added descriptive name to PR
    • Your PR should NOT be called Update index.md since it does not help the maintainer understand what has been changed.
    • For example, if you create a Variables article inside the Python directory, the pull request title should be Python: add Variables article.
    • Other examples are Git: edit Git Commit article or PHP: create PHP section and add Data Structures article
  • [] Reviewed necessary formatting guidelines in CONTRIBUTING.md.
  • [] No plagiarized, duplicate or repetitive content that has been directly copied from another source.

@camperbot
Copy link

Deploy preview for guide ready!

Built with commit 22069f1

https://deploy-preview-8018--guide.netlify.com

@elaine-jackson elaine-jackson self-assigned this Feb 16, 2018
Copy link
Contributor

@elaine-jackson elaine-jackson left a 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 :-)

@iabrenne
Copy link
Contributor Author

iabrenne commented Feb 17, 2018

Hi, @nsuchy. Sorry, I am still pretty new at this and never dealt w/ a merge conflict before. Not quite following, though, why there would be a conflict with these two files, as pr #8026 does not include them? Thank you for your guidance.

@iabrenne iabrenne closed this Feb 17, 2018
@iabrenne iabrenne reopened this Feb 17, 2018
@elaine-jackson
Copy link
Contributor

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 :)

@iabrenne
Copy link
Contributor Author

@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!

@elaine-jackson
Copy link
Contributor

@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 git mergetool once you are on this PR's branch and it will walk you through the conflict in vimdiff, or a gui tool if you have one installed. Text editors like Atom and VS Code have easy interfaces to resolve merge conflicts quickly.

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:

@QuincyLarson QuincyLarson dismissed elaine-jackson’s stale review February 23, 2018 21:27

I'm addressing these merge conflicts myself for the sake of expedience.

@QuincyLarson
Copy link
Contributor

@iabrenne Thanks for opening this PR. I'll take care of these conflicts and get this merged so we can keep moving. :)

@QuincyLarson QuincyLarson merged commit 22069f1 into freeCodeCamp:master Feb 23, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants