|
|
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`. Or define a new branch for it like "mergeWith1.2n.x'.
|
|
|
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 `developFairchat`. Or define a new branch for it like "mergeWith1.2n.x'.
|
|
|
|
|
|
|
|
|
## Sync from the RC upstream master to your local git
|
... | ... | @@ -20,10 +20,11 @@ If upstream is not available yet, add it: |
|
|
|
|
|
> git remote add upstream https://github.com/RocketChat/Rocket.Chat.ReactNative
|
|
|
|
|
|
|
|
|
|
|
|
Check out your fork's local master branch.
|
|
|
|
|
|
$ git checkout fairchat-master
|
|
|
> Switched to branch 'fairchat-master'
|
|
|
$ git checkout developFairchat
|
|
|
|
|
|
## Option merge
|
|
|
|
... | ... | @@ -44,7 +45,13 @@ create a branch `mergeWith1.2n.x` |
|
|
|
|
|
Push changes to the fairchat.ReactNative repo
|
|
|
|
|
|
> git push --set-upstream origin mergeWith1.20.0
|
|
|
> git push --set-upstream origin developRC
|
|
|
|
|
|
In the developRC branch we will have now an exact copy of the RC develop branch.
|
|
|
|
|
|
In order to start merge into your working branch
|
|
|
|
|
|
> git push --set-upstream origin developFairchat
|
|
|
|
|
|
Source: [Syncing a fork](https://help.github.com/en/articles/syncing-a-fork)
|
|
|
|
... | ... | |