search

kiranjd / rn-animation

Visualizing and implementing animations in React Native using Animated API
0 stars 1 forks source link

Develop #4

Closed Sukshith27 closed 4 years ago

kiranjd commented 4 years ago

@Sukshith27 There's a merge conflict

kiranjd commented 4 years ago

Run these run after the other:

  1. git remote add upstream https://github.com/kiranjd/rn-animation.git
  2. git fetch
  3. git checkout upstream master
  4. git pull
  5. git checkout develop
  6. git pull upstream master
kiranjd commented 4 years ago

After the above you should see a the conflict. Resolve that conflict and push the changes to develop branch

Sukshith27 commented 4 years ago

merge