search

LetsGrowMoreCommunity / DSA-Playyard

Explore the world of Data Structures and Algorithm
18 stars 51 forks source link

5. Count the number of consistent strings (HASHTABLE) #178

Closed soma2000-lang closed 3 years ago

soma2000-lang commented 3 years ago

Done the code in c++

64

soma2000-lang commented 3 years ago

@Sargam-Agarwal Please Check

Sargam-Agarwal commented 3 years ago

Hey @soma2000-lang The code looks fine. But kindly go through the README. In it, its clearly mentioned what all your codebase should contain. The first three requirements are missing. Fix those points, then will merge your code 👍

And also I can notice that you are making multiple commits in one PR. Kindly dont do that. It will not be possible for us mentors to merge your PR. Commit one solution, create the PR then only. This will ensure separate PRs for separate commits or code files. 👍

soma2000-lang commented 3 years ago

@Sargam-Agarwal Please check now

Sargam-Agarwal commented 3 years ago

Hey @soma2000-lang Code is good now but your PR still has other 2 code files. Kindly delete those. Just keep the Consistent strings one. Let me see then if it works fine because as of now it shows that this commit cannot be merged...it has some conflicts.

soma2000-lang commented 3 years ago

@Sargam-Agarwal I have deleted thse 2 files I cannot resolve the conflict,

Sargam-Agarwal commented 3 years ago

On my end it shows, conflicting files is Heap/C++/4_Relative Ranks.cpp. @soma2000-lang

See to it and let me know accordingly now. Otherwise we'll see to it what can be done next 👍

soma2000-lang commented 3 years ago

@Sargam-Agarwal while contributing to other projects also I faced the issue .But it is to be resolves by the mentors(bascically the ones who merges).on my system its showing- "This branch has conflicts that must be resolved Only those with write access to this repository can merge pull requests. Conflicting files Heap/C++/4_Relative Ranks.cpp"

Sargam-Agarwal commented 3 years ago

Okk let me check if something is possible from my end 👍

Sargam-Agarwal commented 3 years ago

Hey @soma2000-lang, The way you have contributed has created a lot of chaos. Your solution for this question and also for the question Buy and Sell Stocks cannot be merged. I had a talk with the mentor for that question as well. Its creating conflicts. So, kindly close both the PRs. Create new PRs and please this time create separate PRs for each code.

soma2000-lang commented 3 years ago

@Sargam-Agarwal I had created a seperate PR only.I think the reason it has shown conflicting files happens when anyone's files gets merged after my cloning the repo.As u can see I created seperate branches for both this question and Buy and sell stock one ,so that the conflict is not there.