... | ... | @@ -49,10 +49,14 @@ Source: [Syncing a fork](https://help.github.com/en/articles/syncing-a-fork) |
|
|
|
|
|
Instead of merging, we may want to rebase so that we have a new master with all features.
|
|
|
|
|
|
> git checkout master
|
|
|
> git rebase upstream/master
|
|
|
> git checkout fairchat-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! Be very careful with this command!
|
|
|
Now you solve the merge conflicts e.g. using Gitkraken.
|
|
|
|
|
|
Build the app.
|
|
|
|
|
|
If everything is 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!
|
|
|
|
|
|
> git push --force
|
|
|
|
... | ... | |