Github is showing the branch has some conflicts. but if i remove the code it will give error. what should i do ? @Mohitmadhav

Github is showing the branch has some conflicts. but if i remove the code it will give error. what should i do ? @Mohitmadhav

Did you do git pull upstream main before pushing your changes?

Github is showing the branch has some conflicts. but if i remove the code it will give error. what should i do ? @Mohitmadhav

Github is showing the branch has some conflicts. but if i remove the code it will give error. what should i do ? @Mohitmadhav

Is this the only conflict showing to you?

yes this is the only conflict showing to me.

Github is showing the branch has some conflicts. but if i remove the code it will give error. what should i do ? @Mohitmadhav

Did you do git pull upstream main before pushing your changes?

@keyurgit45 ?

I did. But i got this ->
$ git pull upstream main
fatal: 'upstream' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

So I did git pull origin main and I got ->
From https://github.com/keyurgit45/Flutter-UI

• branch main -> FETCH_HEAD
  Already up to date.

fatal: 'upstream' does not appear to be a git repository
fatal: Could not read from remote repository.

try out
git remote add upstream https://github.com/Project-Easter/Flutter-UI

Then again git pull upstream main

@keyurgit45 I'm getting null uid when I login

Try out: https://stackoverflow.com/questions/62157993/nosuchmethoderror-the-getter-uid-was-called-on-null-in-flutter

I implemented sign up with Email not login. Also the app is missing log out feature.

I implemented sign up with Email not login. Also the app is missing log out feature.

Yeah, I assigned Google Sign out to someone else.
Also, I was creating another issue for login and logout so you can work on that too if you want.

I implemented sign up with Email not login. Also the app is missing log out feature.

Yeah, I assigned Google Sign out to someone else. Also, I was creating another issue for login and logout so you can work on that too if you want.

Sure, I would Like to work on them.

I implemented sign up with Email not login. Also the app is missing log out feature.

Yeah, I assigned Google Sign out to someone else. Also, I was creating another issue for login and logout so you can work on that too if you want.

Sure, I would Like to work on them.

Cool, the issue will be ready within a few minutes.

I implemented sign up with Email not login. Also the app is missing log out feature.

Yeah, I assigned Google Sign out to someone else. Also, I was creating another issue for login and logout so you can work on that too if you want.

Sure, I would Like to work on them.

Cool, the issue will be ready within a few minutes.

Thank you for your help. This is my first open-source contribution. Also, can you remove my email id's from firebase that I used for testing purpose?

I implemented sign up with Email not login. Also the app is missing log out feature.

Yeah, I assigned Google Sign out to someone else. Also, I was creating another issue for login and logout so you can work on that too if you want.

Sure, I would Like to work on them.

Cool, the issue will be ready within a few minutes.

Thank you for your help. This is my first open-source contribution. Also, can you remove my email id's from firebase that I used for testing purpose?

No problem bro.
Sure, will remove those email ids from firebase.