Skip to content

Conversation

@robinsingh-ai
Copy link
Contributor

fixes #31
Added google authentication and chat room feature with Context API

@DhairyaBahl
Copy link
Owner

@Robin025 Kindly resolve all the conflicting files and also add some screenshots of the features you have added till now and because this issue was too big for one-person, I will count it as two level3 issues 😊✌.

All the best.

@robinsingh-ai
Copy link
Contributor Author

robinsingh-ai commented Mar 20, 2021

@DhairyaBahl can you guide me on how to solve these conflicting files because I have deleted messages.js file from my branch

@DhairyaBahl
Copy link
Owner

@abhijeet007rocks8 @dilemmawalker Kindly help him out.

Regards ^__^

@abhijeet007rocks8
Copy link
Collaborator

abhijeet007rocks8 commented Mar 27, 2021

@Robin025 try

  1. to re-fork and then add you changes as other changes in the codebase maybe the reason causing conflict. Else,
  2. re-forking the repo and push the code to a new branch.

Also it would be great if you could put some working screenshots of the fixed version of issue.

@robinsingh-ai
Copy link
Contributor Author

@Robin025 try

  1. to re-fork and then add you changes as other changes in the codebase maybe the reason causing conflict. Else,
  2. re-forking the repo and push the code to a new branch.

Okay....got it
Thank you for the help

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Feature for adding authentication and creating different chat groups for users

3 participants