Skip to content

Conversation

@ruppysuppy
Copy link
Member

Welcome to JavaScript community

Describe your change:

  • Add an algorithm?
  • Fix a bug or typo in an existing algorithm?
  • Documentation change?

Checklist:

  • I have read CONTRIBUTING.md.
  • This pull request is all my own work -- I have not plagiarized.
  • I know that pull requests will not be merged if they fail the automated tests.
  • This PR only changes one algorithm file. To ease review, please open separate PRs for separate algorithms.
  • All new JavaScript files are placed inside an existing directory.
  • All filenames should use the UpperCamelCase (PascalCase) style. There should be no spaces in filenames.
    Example:UserProfile.js is allowed but userprofile.js,Userprofile.js,user-Profile.js,userProfile.js are not
  • All new algorithms have a URL in its comments that points to Wikipedia or other similar explanation.
  • If this pull request resolves one or more open issues then the commit message contains Fixes: #{$ISSUE_NO}.
@ruppysuppy
Copy link
Member Author

I am unable to rebase using git rebase HEAD~2 --onto master the commits due to some problem in HeapSort.js (I haven't touched it but it says that there are some changes, which I am unable to stage either using git add .)

@@ -0,0 +1,31 @@
const fetch = require('node-fetch')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file is already in this #196 PR, please remove this file from this PR so, no conflict arises

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I branched off from the web-programming branch by mistake and due to the HeapSort issue I am unable to rebase the branch on the master. What should I do?

@itsvinayak itsvinayak merged commit b2b1ad3 into TheAlgorithms:master Jun 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants