adityaarakeri / Interview-solved

🌴 Solutions to few of the interview coding challenges in Python 🐍
MIT License
40 stars 62 forks source link

Syntax Updated with Py3 #93

Closed Siddhant-K-code closed 3 years ago

Siddhant-K-code commented 3 years ago

All Submissions:

Changes:

Closing issues

closes #89

adityaarakeri commented 3 years ago

resolve all the conflicts

Siddhant-K-code commented 3 years ago

@adityaarakeri if anything left ? please point it out, and if not, pls merge.

adityaarakeri commented 3 years ago

@Siddhant-K-code rebase your PR with the master branch and you should be able to resolve the merge conflicts

Siddhant-K-code commented 3 years ago

@adityaarakeri It will be fixed when you will merge it. it is very difficult to push it from master branch

adityaarakeri commented 3 years ago

@adityaarakeri It will be fixed when you will merge it. it is very difficult to push it from master branch

It does not allow me to merge with merge conflicts. refer this if you dont know how to resolve - >https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line

Siddhant-K-code commented 3 years ago

check if you can merge it ? @adityaarakeri

adityaarakeri commented 3 years ago

@Siddhant-K-code please resolve merge conflicts, only then i can merge this.

Siddhant-K-code commented 3 years ago

I don't know why, but I didn't even edit the file which has conflicts

Siddhant-K-code commented 3 years ago

image I think it has a lot of conflicts

Siddhant-K-code commented 3 years ago

@adityaarakeri please check, review and merge #102

adityaarakeri commented 3 years ago

@Siddhant-K-code again i cannot merge if there are conflicts.

Siddhant-K-code commented 3 years ago

@adityaarakeri #102 has no conflicts