Closed Siddhant-K-code closed 3 years ago
resolve all the conflicts
@adityaarakeri if anything left ? please point it out, and if not, pls merge.
@Siddhant-K-code rebase your PR with the master branch and you should be able to resolve the merge conflicts
@adityaarakeri It will be fixed when you will merge it. it is very difficult to push it from master branch
@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
check if you can merge it ? @adityaarakeri
@Siddhant-K-code please resolve merge conflicts, only then i can merge this.
I don't know why, but I didn't even edit the file which has conflicts
I think it has a lot of conflicts
@adityaarakeri please check, review and merge #102
@Siddhant-K-code again i cannot merge if there are conflicts.
@adityaarakeri #102 has no conflicts
All Submissions:
Changes:
Closing issues
closes #89