Lab Objective. Lab Assignment. Downloads and Installation

Size: px

Start display at page:

Download "Lab Objective. Lab Assignment. Downloads and Installation"

Kathleen Payne
5 years ago
Views:

1 How I Start Working with Git: Git Lab 01 Adapted from: (1) (2) Lab Objective 1. Installing and using VS Code 2. Overview of Git 3. Start Using Git 4. git --version 5. Using git init and git config 6. Understand git add and git add a.txt 7. Using git log 8. Using git commit 9. Using git Status Visual Studio Code (VSC from now on) has a similar idea as Emacs has, to provide a very simple editing tool but powerful at the same time providing the full development cycle (editing, building and debugging all inside the tool). It runs with native performance on Windows, OS X and Linux and with a very adaptive UI that looks and feels native to the OS where it runs, which is a plus. Lab Assignment Submit your story of starting and practicing git along with proper screen shots. Take print out and share your MS-Word file on slack account from your private team channel. Downloads and Installation 1) Install VS code 2) Git - VS Code has built-in support for source code control using Git but requires Git to be installed separately.

2 Overview of Git 1) Command line utility for managing different files, commits, branches, merging, tags. 2) Typically, of the form: git <command> <files/hash/> 3) GUIs also available to simplify basic tasks e.g. gitk(linux), tower (Mac), GitX (Mac) 4) Also integrated with development environments such as Eclipse, Visual Studio and XCode. 5) Editor support in Atom, vim, emacs. 6) Terminology: repository: where the files current and historical data are stored branch: a complete and independent version of the code that can evolve separately to other versions (branches) master: Usually the main branch of the code, sometimes called trunk head: the most recent commit to the branch tag: a reference to an important snapshot in time 7) Terminology: actions add add a file to the staging area commit save a file in the staging area to the repository checkout copy the last version of a file or branch to the working directory merge combine two branches together to make a new version conflict a parallel change to the same lines of a file so the version control system does not know what to do remote copy of the repository not located on your local machine pull download the latest version of a branch from a remote location push upload your version of a branch to a remote location clone make a complete copy clone of the repository fork a version of the code at a point in time where two or more branch share a common history

(As a Lab work it will contain Scope of chosen project) 3) Add your text file to the files tracked by Git.

3 Part A: My First Experience with Git Step 1 Create Folder, File and add it to Git 1) Create a new folder on your computer and Start VS code. 2) Put a text file into the repository. (As a Lab work it will contain Scope of chosen project) 3) Add your text file to the files tracked by Git. Step 2 init git 1) Initialize a new git repository inside your folder. You can do it at the time of folder creation as well. git init creates a hidden subfolder.git where Git stores the information it needs to do its job.

4 Step 3 git log and Initial commit 1) To check that your commit is successful, read the log file and take a look at the status of your working directory.

If the values are not found in both Workspace & User settings

5 2) 2 nd Try Before making a commit, VS Code will look for git.username & git. in Workspace then User settings. If the values are not found in both Workspace & User settings then it reverts back to default behavior of fetching from git global config.

6 3) 3 rd Try Faced some error. So I manually delete previous text file controversial.txt and add entirely new file scopewriting.txt to folder. Try Practicing all commands again:

The command git add tells Git which files we want to add to staging area.

7 Why you need a?? Git includes an intermediate step called the staging area or the index that it uses to prepare a commit. This allows to not commit all changes at once. The command git add tells Git which files we want to add to staging area. Only the files that have been added to staging area will be committed. If you want ot commit all changes (not the default behavious of Git) in a commit, use the a flag. Step 4 Make drastic changes to scope writing.txt

8 Step 5 New commits Log

9 Part B: Towards Programming Step 1 A New Project (Follow Instructions and Orange Boxes) Right Click inside folder Close Welcome window Go to Terminal at Bottom

11 Step 9 Create Text File from Power shell Step 10 Create.cpp and.h File

12 Step 11 Install C/C++ or required Extensions Step 9 Create Files for Programming

13 Step 9 Adding file to git

14 Step 10 Check status Step 11 Modify Hello.txt git add hello.txt [add new version to repo] git commit m [commit it] git log [list of previous commits]

Motivation for change is more important than what was changed, as

15 Commit messages Always write helpful commit messages (-m option): what was changed and why? bugfix, feature or refactoring? Motivation for change is more important than what was changed, as the latter is obvious from the file diff Step 12 Delete and Recover Hello.txt

16 Deleted file reappears again Lesson from Git Lab 01 Commit small chunks and often

Lab 01 How to Survive & Introduction to Git. Web Programming DataLab, CS, NTHU

Lab 01 How to Survive & Introduction to Git Web Programming DataLab, CS, NTHU Notice These slides will focus on how to submit you code by using Git command line You can also use other Git GUI tool or built-in