... | @@ -82,3 +82,28 @@ If you want to update the develop branch from upstream in https://git.fairkom.ne |
... | @@ -82,3 +82,28 @@ If you want to update the develop branch from upstream in https://git.fairkom.ne |
|
|
|
|
|
> git checkout upstream/develop
|
|
> git checkout upstream/develop
|
|
> git push origin HEAD:develop
|
|
> git push origin HEAD:develop
|
|
|
|
|
|
|
|
## Start over in a nutshell
|
|
|
|
|
|
|
|
Throw away developFairchat and create a new empty one with the actual developRC code:
|
|
|
|
|
|
|
|
```
|
|
|
|
git checkout developRC
|
|
|
|
git fetch upstream
|
|
|
|
git checkout developFairchat
|
|
|
|
git push origin --delete developFairchat
|
|
|
|
git push origin -u developFairchatStuck1
|
|
|
|
git checkout -b developFairchat
|
|
|
|
git push --set-upstream origin developFairchat
|
|
|
|
```
|
|
|
|
|
|
|
|
then cherry pick
|
|
|
|
|
|
|
|
```
|
|
|
|
// android launch screen in all resolutions
|
|
|
|
git cherry-pick 6acc21e4
|
|
|
|
// replace in all resolutions logo
|
|
|
|
git cherry-pick afe7107
|
|
|
|
```6
|
|
|
|
|
|
|
|
see commits |