Git and Github. FTC 5421 and 8121

Transcription

1 Git and Github FTC 5421 and 8121

2 Typical FTC Programming Workflow Each person is sent to do an individual task Coded individually at home, at school or a meeting place Sent through or file share (ie dropbox)/transfer (via USB)

3 What is a Version Control System (VCS)? What is "version control", and why should you care? Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later. -git-scm.com Allows people to not need to make a backup file

4 What is Git? Git is an open source version control system Originally designed for Linux as a low-level VCS Geared toward documentation and group based projects with features including: Branching and merging Staging Subversion-style workflow

5 What is Github? An online based codeshare centered around Git Online repositories - highly useful Promotes team collaboration and involvement from the whole team Allows for individuals to work on different or same parts of a project without interfering with each other. Also sets issues and project calendars. Allows easy tracking of code changes over time Incorporates many third party software to be very useful.

6 Methods of using Git/Github 3 Main methods: Command line/git bash Git GUI/GitHub/SourceTree Integrated into IDEs (Android Studio, Eclipse, IntelliJ IDEA)

7 Git Tutorial

8 What is a repository? A repository is a data structure storing files and folders Where your work for the project will be stored Each repository contains branches

9 Git Workflow

10 Git Workflow

11 Git Workflow

12 Command: git init First command when creating a repository Creates a.git sub-directory for your project Note that this is only local and has not been integrated with Github yet Only needs to be done when creating a new repository

13 Command: git status Is used to determine what current state your directory or files are in Three states that files can be in: Untracked files Modified files - already tracked Staged files - unmodified tracked files

14 Command: git add Moves an untracked directory/file into the staged state

15 Command: git rm Is used to remove files from the index and working directory, stops tracking the file specified. Subcommands: --dry-run - shows if the files specified can be removed --cached - removes the file from the index but not the working directory.

16 Command: git commit [-m] commits the files in the staged state to the repository as well as creating a new revision log. This is to the local repository and not to the remote one. The -m allows addition of a message to the commit, this is used to organize and keep track of changes and updates to the code.

17 Command: git push Moves the files on the local repository onto the remote repository Have to specify the remote repository or defaults to origin

18 Command: git pull Pulls the remote repository to the current branch on the local repository. This allows incorporation of other team members and an interactive coding experience.

19 What is a branch? An effective way to point to commits or in other words a way to store data.

20 Command: git branch Displays all branches in the repository and can be used to keep track of all changes in branches Manages branches but not the files in the branch

21 Command: git checkout Used to create new branches Moves the HEAD pointer

22 Command: git merge Merges two branches together, the commits into another branch. How to merge: git checkout to the branch that you want the merge to affect (typically master) git merge, enter the branch you want to merge. After the merge is complete, the other branch will still exist and git branch -d can be used to get rid of the other branch.

23 Merge Conflicts Occurs when two of the same lines of a program are changed: The drive program was bad. One person merges his now more efficient drive program to master, another person finishes his drive program based on the original unaware of the first person s changes. The second person pulls and attempts to merge, but finds an error. What does he do? git diff, used to check the changes between his code and the updated code and decide to keep or delete the changes in code git mergetool runs a visual merge tool that runs through all the conflicts, effective over manually going through every single line of code git merge --abort, to cancel the merge

24 Other Commands git clone - Clones a repository (with Github it creates a new local repository from remote repository) git log - Displays a log of the previous commits and their descriptions git config - sets your and username, marking who changed the code/committed git stash, git diff, git fetch, git revert, etc. Since git is run from command line, it is also good to learn/have some basic knowledge of how command line works. cd - change directory, changes the working directory that one is in ls - list files in the directory

25 Questions? contact us at