BIT 300: Get-Set Mobile Github and Android Studio

GIT basics and Best Practices

1. Why Git?

   • There are other version control systems. There are a number of Version Control Systems out there. This alone should prove that version control is incredibly important. Examples

     • Git
     • Subversion
     • Mercurial

   • Git is the most popular and an industry standard.

   • It has some advantages over a centralized system, which has a single copy of the code:

     • It's quick to take action on your own copy
     • It works locally, on your own computer, and offline
     • It makes having multiple branches, parallel worlds of code, easier

     

2. Git Gotchas

   • Git can mean several things - the name of the source control technology, the functionality built into VS Code, the file formats and protocols that underlie the system.
   • It’s both powerful (because it’s open-ended), plentiful (because it’s open source), and sometimes hard to use (because it’s open-ended).
   • It takes practice, it's a learned skill, it's not intuitive - ask other developers about their Git disasters - everyone has a story.

Git Demo Using Git Bash/ Android Studio Terminal

1. Creating new repo and initial commit. The flow for using git starts with creating a directory (folder). The cycle as changes are made is add and commit. Small chunks as you go.

   • Configure your git
     • git config --global user.email "youremail"
     • git config --global user.name "yourname"
   • mkdir SampleApp - create new folder named SampleApp
   • cd SampleApp - move to the project folder
   • git init - initialize the repository
   • touch README.md - create a new file
   • git status - view the repository status
   • git add . - stage the files to commit and tell get what files to track, "." selects all the new files or files with changes
   • git commit README.md -m "New readme file" - add the changes to the repo with the named file, "-m" indicates message included

Demo: Git using Android Studio's VCS menu

1. Create a new "Empty" project in Android Studio and use the built-in git support (VCS menu). It doesn't have all the commands of Git Bash but is convenient when working in Android Studio.

2. Use "VCS > Enable Version Control Integration" to initialize a repository using "Git"

3. Add a TEXT file called "myFile" (File/New/File)

4. Follow the git workflow using "VCS>Commit". We need to complete staging for the changes

   • select the file from the list (this takes care of the staging process - the git add step)
   • Type a commit message in the box, like "Adds myFile
   • click "Commit"

5. Review the effect using the Terminal

   • Open the "Terminal" tab "View > Tool Windows > Terminal"
   • Check out the changes with git log
   • See the difference between git log and git log --oneline

Work with Remote GitHub repositories

use the Canvas document to complete the exercise with a partner

1. Fork and Clone this GitHub repository
2. Use both the terminal and Android Studio to work with Git
3. Push your changes to GitHub
4. Submit the URL for your updated repo in Canvas