Jake Ginnivan Git for TFS Version Control developers DEV32 4.

Slides:



Advertisements
Similar presentations
An Introduction By Sonali and Rasika.  Required for the project  Show the versions of your code in the course of development  Show versions of your.
Advertisements

om om GIT - Tips & Tricks / git.dvcs git-tips.com
1 CSE 390 “Lecture 11” Version control with Git slides created by Ruth Anderson, images from
Introduction to Git and Github Joshua imtraum.com.
Git for Version Control These slides are heavily based on slides created by Ruth Anderson for CSE 390a. Thanks, Ruth! images taken from
Getting Started with GIT. Basic Navigation cd means change directory cd.. moves you up a level cd dir_name moves you to the folder named dir_name A dot.
With Mercurial and Progress.   Introduction  What is version control ?  Why use version control ?  Centralised vs. Distributed  Why Mercurial ?
GIT An introduction to GIT Source Control. What is GIT (1 of 2) ▪ “Git is a free and open source distributed version control system designed to handle.
Version Control Systems academy.zariba.com 1. Lecture Content 1.What is Software Configuration Management? 2.Version Control Systems (VCS) 3.Basic Git.
Paul McGrath.  Speedy Input  Speedy Visualisation  Speedy Workflow.
1 GIT NOUN \’GIT\ A DISTRIBUTED REVISION CONTROL AND SOURCE CODE MANAGEMENT (SCM) SYSTEM WITH AN EMPHASIS ON SPEED. INITIALLY DESIGNED AND DEVELOPED BY.
Sofia Event Center May 2014 Martin Kulov Git For TFS Developers.
Jessica Payne Microsoft Global Incident Response and Recovery
GIT.
Intro to Git presented by Brian K. Vagnini Hosted by.
Andrew Hennessy Automating Server Application migrations to the Cloud – Goodbye Server INF21 3.
Kevin Francis Developing on Windows Devices ARC33 2.
Chris Hewitt Adding magic to your business with Perceptual Intelligence ARC323 B.
Matt McSpirit Software-defined Networking in Windows Server 2016 INF32 4.
@mariorod1 source control models.
Vakhtang Assatrian Asia Communications TSP Lead, Microsoft Architecture options for implementing Skype for Business PRD32 7.
Michael Niehaus Using the Windows Store for Business: New Capabilities for Managing Apps in the Enterprise WIN335.
Jessica Payne Microsoft Global Incident Response and Recovery
Dr Greg Low Working with SQL Server Spatial Data DAT33 3.
Mike James Building a cross-platform pedometer app with Xamarin & Azure MOB334.
James Bannan Freddy vs JSON: Azure Resource Manager CLD44 3.
Pat Fetty – Principal PM Manager Securing your mobile assets with Microsoft Intune WIN33 1.
Nick Application Development for the Universal Windows Platform MOB225.
Alec Tucker An Introduction to Cross Platform Native App Development using Xamarin to Develop, Test and Monitor MOB227.
Orin Thomas 30 Bad Habits of Server Administrators INF32 3.
Fai Lai Global IoT Tech Specialist, C+E Specialist Sales Seamless communication between devices and Azure IoT Hub via Azure IoT Protocol Gateway MOB31.
Orin EDP, EFS, BitLocker, RMS, DAC, and IPsec: Protect your files at rest and in transit. WIN341 A.
Building a Microservices solution using Docker,
Ryan Newington From Fortran to FIM: Dragging your identity management system out of the dark ages WIN332 B.
Kevin Francis Big Building Blocks – a tour of Dynamics ARC323 A.
Marc Soester Project Visualization, Resource Management and Collaboration using Office 365 Project Online PRD32 6.
James Bannan The Cloud That Chuck Norris Built: Resilient Architecture in Azure ARC44 3.
Introduction to Git - Chirag Dani. Objectives Basics of Git Understanding different “Mindset of Git” Demo - Git with Visual Studio.
INTRODUCTION TO GIT. Install Egit for eclipse Open eclipse->Help->Install New Software Search for one of the following -
1. A new git is initialized as a remote repository JohnRemote repositoryPeter master C0 CodingWhileBlack.com PROPEL CODING
Getting Started with Git Presented by Jim Taylor Rooty Hollow, Owner Verizon Wireless, Senior Programmer/Analyst Git User for 6 years.
KIT – University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association STEINBUCH CENTRE FOR COMPUTING - SCC
I Don’t Git It: A beginner’s guide to git Presented by Mathew Robinson
11 Version control (part 2)
Building Business Application with Office 365 and Other Line Business Systems
Git Practice walkthrough.
SSE2034: System Software Experiment 3 Spring 2016
Git for Visual Studio Developers MARTIN KULOV, ASE
Git Workflows.
Akshay Narayan git up to speed with RCS Akshay Narayan
SIG: Open Week 1: GitHub Tim Choh.
Build vNext in VSO and TFS 2015
What’s new in Visual Studio in 2015?
Rob Farley, LobsterPot Solutions
Application Insights:
Version Control System - Git
Version control with Git
Introduction to Git and GitHub
What is Visual Studio Code?
Version Control with Git
Jonathan Ruckert & Darren Neimke
UI test automation of MVC apps with Microsoft Edge WebDriver
Git Fundamentals.
Git Introduction.
Git GitHub.
Securing ASP.NET in an Azure Environment
Introduction to The Git Version Control System
Advanced Git for Beginners
Presentation transcript:

Jake Ginnivan Git for TFS Version Control developers DEV32 4

VCS MS work here and here

Team Foundation Server/Service Project 2Project 1 3 rd Party Local Repo Other Remote Git Repo

[Changeset 2] [Changeset 3] [Changeset 2] Changeset 3 Changeset 1 Changeset 2 Get latest (Changeset 3) [Changeset 3]

Changeset 3 Changeset 1 Changeset 2 75c8b5 3a6f61 6a286b How are commit IDs generated?  Can’t be monotonically increasing without a server to arbitrate  A cryptographic hash (SHA1) of the contents of the commit

75c8b5 3a6f61 6a286b 75c8b5 3a6f61 6a286b 8c62e8 087f8d 8c62e8 087f8d *Clone* 75c8b5 3a6f61 6a286b 8c62e8 087f8d 10d3f74 *Fetch* 10d3f74 *Push*

Git commits are a snapshot of the content TFVC change sets are deltas of the changes to the content

Changeset 2 -Some description +A better description 3 3a6f61 # My readme Some description b3af9c # My readme A better description Changeset 2 # My readme Some description 1

Renames Git does not track renames Commits are a snapshot of the entire repository No additional metadata about deltas between commits Git guesses renames Compare deleted files to added files Similar files are deemed “renames” Heuristic approach to renames is more accurate than relying on user input.

75c8b5 3a6f61 6a286b 8c62e8 087f8d 10d3f74 master feature/foo $Ignite Main C:\Workspaces\Ignite Branches FeatureFoo C:\Workspaces\Ignite\Main C:\Workspaces\Ignite\Branches\FeatureFoo C:\Code\IgniteGitRepo HEAD

master origin/master

master origin/master

master origin/master

master origin/master

> git pull master

Pull requests

master origin/master feature/foo

master origin/master feature/foo

master origin/master feature/foo

master origin/master feature/foo

master origin/master

> git pull master --rebase

master Merge master Rebase

master > git reset HEAD~4 --hard

> git reflog aef1ebc reset: moving to HEAD~4 4efbd1e commit: commit7 a commit: commit6 ba16220 commit: commit5 004e6a3 commit: commit4 aef1ebc commit: commit3 4c86bab commit: commit b commit: commit1 f57c13d commit (initial): initial commit

ShelfsetStash LabelTag Gated Checkin File Lock Checkin policy Bisect Interactive rebase

git-scm.com/download/win or choco install git.install git config --global user.name "Jake Ginnivan" git config --global user.

Continue your Ignite learning path Visit Microsoft Virtual Academy for free online training visit Visit Channel 9 to access a wide range of Microsoft training and event recordings Head to the TechNet Eval Centre to download trials of the latest Microsoft products