Update how to sync repos authored by Roland Alton's avatar Roland Alton
......@@ -3,7 +3,7 @@ Here we describe the procedure to sync this fairchat.ReactNative repo on your ma
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`. Or define a new branch for it like "mergeWith1.2n.x'.
Open Terminal.
## Sync from the RC upstream master to your local git
Change the current working directory to your local fairchat.ReactNative project.
......@@ -50,6 +50,8 @@ Source: [Syncing a fork](https://help.github.com/en/articles/syncing-a-fork)
## Option rebase
(not recommended, as it loops with a lot of merge proposals)
Instead of merging, we may want to rebase so that we have a new master with all features.
> git checkout fairchat-master
......@@ -64,3 +66,12 @@ If everything is fine, then you might push it. Only do so, when nobody else has
> git push --force
Source: https://www.atlassian.com/de/git/tutorials/merging-vs-rebasing
## Publish in repo
> git push
If you want to update the develop branch from upstream in https://git.fairkom.net/chat/fairchat.ReactNative/tree/develop then you do a
> git checkout upstream/develop
> git push origin HEAD:develop
\ No newline at end of file