... | ... | @@ -41,8 +41,6 @@ $ git merge upstream/master |
|
|
|
|
|
If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":
|
|
|
|
|
|
create a branch `mergeWith1.2n.x`
|
|
|
|
|
|
Push changes to the fairchat.ReactNative repo
|
|
|
|
|
|
> git push --set-upstream origin developRC
|
... | ... | @@ -53,6 +51,8 @@ In order to start merge into your working branch |
|
|
|
|
|
> git push --set-upstream origin developFairchat
|
|
|
|
|
|
or create a branch `mergeWith1.2n.x` to merge into
|
|
|
|
|
|
Source: [Syncing a fork](https://help.github.com/en/articles/syncing-a-fork)
|
|
|
|
|
|
## Option rebase
|
... | ... | |