Git python core

Agenda

Source Control Management (SCM)
Fundamental Concepts
Terms
Types of Version Control Systems
Git
Before start
Configuration
Basics
Work cycle
Branches

SCM

Revision control, also known as version control and source control (and

Fundamental Concepts of SCM

Tracking changes
Committing
Revisions and Change sets
Getting updates
Conflicts
Diffing (or, viewing

Main terms

Repository
Working Copy
Merging
Revision

System version control

Centralized: CVS, Perforce, SVN, Team Foundation Server (TFS)
Distributed: Git,

GIT Intro

Git – is a distributed revision control system with an

Before start

Firstly we need to check if we have a git

If we need to know sth ☺

Help yourself
$git help
$git

Let’s configure git ☺

Git comes with tool called git config
Identity
$ git

Create repository

git init – create an empty local repo
git clone

GIT basics

Git store snapshots of file system not differences!!!
Almost every operation

Git data transport commands

Must know commands!

git status - Show the working tree status
git log

GIT Work Cycle

Clone repository
git clone
git init
Create your branch
git branch
Modify working copy
git

Branch

A branch represents an independent line of development. Branches serve as

Let’s imagine

Three commits on master

1

2

git checkout –b iss53

3

git commit …

4

git checkout

Merging

5

git checkout master
git merge hotfix

6

7

git merge iss53

Rebasing

1

Some initial state

2

git checkout experiment
git rebase master

Team player / issue / bug fix philosophy

Clone repository https://github.com/kolyasalubov/Lv-367.PythonCore.git
Add to file «ZenPython.txt» few lines and commit it

HomeWork (online course)

Play on site https://try.github.io
Please register on Learn Git Branching:

References and Sources

Simplified views:
Everyday commands
Visual guide to GIT
Easy version control with