Update how to sync repos authored by Roland Alton's avatar Roland Alton
...@@ -8,33 +8,33 @@ Change the current working directory to your local fairchat.ReactNative project. ...@@ -8,33 +8,33 @@ Change the current working directory to your local fairchat.ReactNative project.
Fetch the branches and their respective commits from the upstream repository. Commits to master will be stored in a local branch, upstream/master. Fetch the branches and their respective commits from the upstream repository. Commits to master will be stored in a local branch, upstream/master.
$ git fetch upstream $ git fetch upstream
> remote: Counting objects: 75, done. > remote: Counting objects: 75, done.
> remote: Compressing objects: 100% (53/53), done. > remote: Compressing objects: 100% (53/53), done.
> remote: Total 62 (delta 27), reused 44 (delta 9) > remote: Total 62 (delta 27), reused 44 (delta 9)
> Unpacking objects: 100% (62/62), done. > Unpacking objects: 100% (62/62), done.
> From https://github.com/RocketChat/Rocket.Chat.ReactNative/> * [new branch] master -> upstream/master > From https://github.com/RocketChat/Rocket.Chat.ReactNative/> * [new branch] master -> upstream/master
Check out your fork's local master branch. Check out your fork's local master branch.
$ git checkout master $ git checkout master
> Switched to branch 'master' > Switched to branch 'master'
Merge the changes from upstream/master into your local master branch. This brings your fork's master branch into sync with the upstream repository, without losing your local changes. Merge the changes from upstream/master into your local master branch. This brings your fork's master branch into sync with the upstream repository, without losing your local changes.
$ git merge upstream/master $ git merge upstream/master
> Updating a422352..5fdff0f > Updating a422352..5fdff0f
> Fast-forward > Fast-forward
> README | 9 ------- > README | 9 -------
> README.md | 7 ++++++ > README.md | 7 ++++++
> 2 files changed, 7 insertions(+), 9 deletions(-) > 2 files changed, 7 insertions(+), 9 deletions(-)
> delete mode 100644 README > delete mode 100644 README
> create mode 100644 README.md > create mode 100644 README.md
If your local branch didn't have any unique commits, Git will instead perform a "fast-forward": If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":
Push changes to the fairchat.ReactNative repo. Push changes to the fairchat.ReactNative repo.
> git push > git push
Source: [Syncing a fork](https://help.github.com/en/articles/syncing-a-fork) Source: [Syncing a fork](https://help.github.com/en/articles/syncing-a-fork)
\ No newline at end of file