... | ... | @@ -85,25 +85,26 @@ If you want to update the develop branch from upstream in https://git.fairkom.ne |
|
|
|
|
|
## Start over in a nutshell
|
|
|
|
|
|
Throw away developFairchat and create a new empty one with the actual developRC code:
|
|
|
Rename developFairchat to developFairchat2.0.1 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 push origin --rename developFairchat2.0.1
|
|
|
git push origin -u developFairchat2.0.1
|
|
|
git checkout -b developFairchat
|
|
|
git push --set-upstream origin developFairchat
|
|
|
```
|
|
|
|
|
|
then cherry pick
|
|
|
then cherry pick each commit from developFairchat2.0.1 to the developFairchat repo
|
|
|
|
|
|
```
|
|
|
// android launch screen in all resolutions
|
|
|
git cherry-pick 6acc21e4
|
|
|
// replace in all resolutions logo
|
|
|
git cherry-pick afe7107
|
|
|
```6
|
|
|
---
|
|
|
```
|
|
|
|
|
|
see commits |
|
|
In fact apply all commits from 9ff302fd to 117095ae (Nov 9+10 2019) as cherry picks (any other idea how to squash them?) |