Update how to sync repos authored by Roland Alton's avatar Roland Alton
...@@ -15,6 +15,10 @@ $ git fetch upstream ...@@ -15,6 +15,10 @@ $ git fetch upstream
> 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
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. Check out your fork's local master branch.
$ git checkout master $ git checkout master
...@@ -48,9 +52,8 @@ Instead of merging, we may want to rebase so that we have a new master with all ...@@ -48,9 +52,8 @@ Instead of merging, we may want to rebase so that we have a new master with all
> git checkout master > git checkout master
> git rebase upstream/master > git rebase upstream/master
If everything was fine, then you might push it. Only do so, when nobody else has been working on the fairchatRN, as master is shifted! If everything was fine, then you might push it. Only do so, when nobody else has been working on the fairchatRN, as master is shifted! Be very careful with this command!
> # Be very careful with this command!
> git push --force > git push --force
Source: https://www.atlassian.com/de/git/tutorials/merging-vs-rebasing Source: https://www.atlassian.com/de/git/tutorials/merging-vs-rebasing
\ No newline at end of file