Here we describe the procedure to sync this fairchat.ReactNative repo on your machine with the upstream/master branch of the [Rocket.Chat.ReactNative](https://github.com/RocketChat/Rocket.Chat.ReactNative/) project.
The Rocket.Chat.ReactNative upstream/master is the `develop` branch (you have that also locally in your git). It may be merged with the fairchat.ReactNative develop branch, which is `fairchat-master`.
Open Terminal.
...
...
@@ -54,7 +55,7 @@ Instead of merging, we may want to rebase so that we have a new master with all
> git checkout fairchat-master
> git rebase upstream/master
Now you solve the merge conflicts e.g. using Gitkraken.
Now you solve the merge conflicts e.g. using `mergetools`.
