Update git flow docs, set keyboard flag to false
parent
ac4526df5d
commit
d39b700b5f
|
@ -193,7 +193,7 @@ PHONE_KEYBOARD:
|
||||||
TABLE: keyboard
|
TABLE: keyboard
|
||||||
PROVIDERS:
|
PROVIDERS:
|
||||||
RAPIDS:
|
RAPIDS:
|
||||||
COMPUTE: True
|
COMPUTE: False
|
||||||
FEATURES: []
|
FEATURES: []
|
||||||
SRC_FOLDER: "rapids" # inside src/features/phone_keyboard
|
SRC_FOLDER: "rapids" # inside src/features/phone_keyboard
|
||||||
SRC_LANGUAGE: "python"
|
SRC_LANGUAGE: "python"
|
||||||
|
|
|
@ -30,7 +30,7 @@ git commit -m "Add my new feature" # use a concise description
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git checkout feature/feature1
|
git checkout feature/feature1
|
||||||
git pull origin develop
|
git fetch origin develop
|
||||||
git rebase -i develop
|
git rebase -i develop
|
||||||
git checkout develop
|
git checkout develop
|
||||||
git merge --no-ff feature/feature1 # (use the default merge message)
|
git merge --no-ff feature/feature1 # (use the default merge message)
|
||||||
|
|
Loading…
Reference in New Issue