From d39b700b5f149630a2656c99e51e7ade9e436559 Mon Sep 17 00:00:00 2001
From: JulioV <JulioV@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:51:18 -0500
Subject: [PATCH] Update git flow docs, set keyboard flag to false

---
 config.yaml                 | 2 +-
 docs/developers/git-flow.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.yaml b/config.yaml
index dabf5b2c..e712e90b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -193,7 +193,7 @@ PHONE_KEYBOARD:
   TABLE: keyboard
   PROVIDERS:
     RAPIDS:
-      COMPUTE: True
+      COMPUTE: False
       FEATURES: []
       SRC_FOLDER: "rapids" # inside src/features/phone_keyboard
       SRC_LANGUAGE: "python"
diff --git a/docs/developers/git-flow.md b/docs/developers/git-flow.md
index 8f75ab08..44ed220e 100644
--- a/docs/developers/git-flow.md
+++ b/docs/developers/git-flow.md
@@ -30,7 +30,7 @@ git commit -m "Add my new feature" # use a concise description
 
     ```bash
     git checkout feature/feature1
-    git pull origin develop
+    git fetch origin develop
     git rebase -i develop
     git checkout develop
     git merge --no-ff feature/feature1 # (use the default merge message)