search

AnuragThePathak / News-Feed-App

Get news from the world.
Apache License 2.0
4 stars 9 forks source link

UI of Settings Updated #22

Closed parthdhake closed 3 years ago

AnuragThePathak commented 3 years ago

now you will have to resolve conflict first.

parthdhake commented 3 years ago

Can you tell how i can resolve the merge conflicts

AnuragThePathak commented 3 years ago

Can you tell how i can resolve the merge conflicts

Actually I myself never worked on conflict resolution but ig you can check the mentioned conflicting flies in yours and compare with those in my repository and fix.

AnuragThePathak commented 3 years ago

First try the command line options as decribed here. It might be because ur repo and my repo has commit conflict not file.

AnuragThePathak commented 3 years ago

Btw a cheap trick might help. You keep a copy of your local repo then update it. Then copy and paste the files you need to change.