aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Jiang <35908040+leonyjiang@users.noreply.github.com>2020-06-25 10:02:29 -0700
committerLeon Jiang <35908040+leonyjiang@users.noreply.github.com>2020-06-25 10:02:29 -0700
commit8982a483af4bd3186039f7864c34f20bf57578a2 (patch)
tree866cc2768c85d93e7df2eaf6299d84525466ba50
parent29eac397111c4b8c99e158ec20954b61577ee4ed (diff)
make minor fixes to README setup instructions
-rw-r--r--README.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index 352847b9..99b3b52d 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,8 @@ To push your changes on your feature branch to your fork, run the command
`git push origin tmaXX-name-of-feature`
+The first time you push a local feature branch to your fork, run the above command with the `-u` flag (e.g. `git push -u origin tmaXX-name-of-feature`). This sets up the upstream branch. Detailed instructions can be found [here](https://devconnected.com/how-to-push-git-branch-to-remote/).
+
To ensure your local feature branch is up-to-date with the main repository, run this command from your local branch
`git pull upstream master`
@@ -94,11 +96,13 @@ If you've made it here, congratulations! You are one step closer to being fully
### 3) Devtools
+The final step is making sure your computer has the necessary development software to run iOS and Android simulators.
+
Follow the instructions on React Native's docs [here](https://reactnative.dev/docs/environment-setup) under "React Native CLI Quickstart", being sure to follow directions for *your operating system*, for *both target operating systems* (iOS and Android). Stop upon reaching the section "Creating a new application", as our project already exists.
Windows users wishing to develop on iOS will have spin up a virtual Mac (through something like VirtualBox, free, or VMWare Workstation, paid). An alternative solution is to build a "Hackintosh". Unfortunately, none of these solutions are particularly ideal. If this is a major concern, please voice it to the team!
-Now that you've forked your repo and installed your developer tools, you are ready to build and run your project.
+Now that you've forked your repo and installed your developer tools, you are ready to build and run your project!
## Running