From 8982a483af4bd3186039f7864c34f20bf57578a2 Mon Sep 17 00:00:00 2001 From: Leon Jiang <35908040+leonyjiang@users.noreply.github.com> Date: Thu, 25 Jun 2020 10:02:29 -0700 Subject: make minor fixes to README setup instructions --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-70-g09d2