Skip to content

Commit

Permalink
Final(?) formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
NoahAndrews committed Jan 25, 2018
1 parent 87a363c commit 0f103de
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions switching.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,17 @@ and then restart Android Studio.
If you don't care about those features and you want the app to deploy faster,
use the Turbo version, with the command
`git remote add upstream https://github.com/OpenFTC/OpenRC-turbo.git`.

2. Pull from the OpenRC remote you just set up: `git pull upstream master`.

3. Resolve any merge conflicts. The most common reason for these is that you've
added additional modules to the project. My preferred way to do this is by selecting
`VCS > Git > Resolve Conflicts` from the menu bar in Android Studio. You'll need to
have Git set up and enabled in Android Studio for this to work.
([See here](https://www.jetbrains.com/help/idea/using-git-integration.html).)

4. If you had any merge conflicts to resolve, you'll have to commit to finish the merge.

5. You're done! In the future, you can update to new versions of OpenRC with the command
`git pull upstream master`.

Expand Down

0 comments on commit 0f103de

Please sign in to comment.