added screen transition animation

[AyushRajSharma]

[AyushRajSharma]

28

[himanshusharma89]

@AyushRajSharma Resolve all the conflicts and pull the latest code.

[himanshusharma89]

@AyushRajSharma Resolve the conflicts now

[AyushRajSharma]

can you tell me, how to resolve this conflict

[AyushRajSharma]

I don't know, how to resolve branch conflict , please help me!. what should i do for resolve this conflict.

[himanshusharma89]

@AyushRajSharma Add my repo https link as a remote and pull the master branch from it

[AyushRajSharma]

[himanshusharma89]

hi @AyushRajSharma, that's not how you pull the code. And the conflicts are resolved but only 2 files should be changed. I can see 18 files changed and most of those files are already added in the gtignore file. So, can you pull the lastest code again? This how you can do it:

• git remote add upstream https://github.com/himanshusharma89/Flutter-Blog-App.git
• git pull upstream master

[AyushRajSharma]

hi @AyushRajSharma, that's not how you pull the code. And the conflicts are resolved but only 2 files should be changed. I can see 18 files changed and most of those files are already added in the gtignore file. So, can you pull the lastest code again? This how you can do it:

• git remote add upstream https://github.com/himanshusharma89/Flutter-Blog-App.git
• git pull upstream master

[himanshusharma89]

@AyushRajSharma Can you do the git config pull.rebase true the command recommended to you in the terminal

[AyushRajSharma]

@AyushRajSharma Can you do the git config pull.rebase true the command recommended to you in the terminal

nothing happend

[himanshusharma89]

@AyushRajSharma The main issue is with your git config, you have to set it for global. For e.g:

$ git config --global user.name "John Doe"
$ git config --global user.email johndoe@example.com

[AyushRajSharma]

@AyushRajSharma The main issue is with your git config, you have to set it for global. For e.g:

$ git config --global user.name "John Doe"
$ git config --global user.email johndoe@example.com

already edited

[AyushRajSharma]

should i make new pr with latest repo code?

[himanshusharma89]

No @AyushRajSharma, you should not create a new PR, just try to rebase your code.

[himanshusharma89]

Any update @AyushRajSharma

[AyushRajSharma]

will do soon!!, there is semester exam so i am little bit busy

[himanshusharma89]

Oh okay @AyushRajSharma

[himanshusharma89]

Any update? @AyushRajSharma

[himanshusharma89]

Closing this PR because of no progress.