Lab 3: Version control and collaboration...What is version control? Distributed Snapshots Storage...

Introduction

What is versioncontrol?

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Lab 3: Version control and collaboration

Comp Sci 1585Data Structures Lab:

Tools for Computer Scientists

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

1 IntroductionWhat is version control?DistributedSnapshotsStorage landscape

2 Using GitGitting started...commitbranchmerge

Merge conflictsExplorationRemote repositoriesIndustrial workflowFinal tips

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

What is version control?

• Keeps track of changes to your code.

• You don’t have to worry about accidentally losing ordeleting code.

• You can experiment and reset to a known good state.

• Makes collaborating with others easier.

What is Git?

• Git is software - it is not GitHub, which is a website

• Distributed - everything is kept on your local machine.

• ‘Repository’ - a collection of code and history.

• ‘Commit’ - a chunk of saved changes.

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Distributed version control

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Snapshots (commits) include all files

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Three places where edits exist

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Gitting Started...

• $ git init Makes a new empty git repository.

• $ git add <FILENAME> Adds changes in FILENAME tothe next commit.

• $ git status Shows the status of the repository.

• $ git config --global user.name "<YOUR FULL NAME>"

• $ git config --global user.email <EMAIL>

• $ git config --global core.editor vim

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Committing

$ git commit -m ‘‘a’’

amaster

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Committing

$ git commit -m ‘‘b’’

bmaster

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Committing

$ git commit -m ‘‘c’’

cmaster

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Branching

$ git checkout -b new-branch

master

new-branch

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Branching

$ git commit -m ‘‘d’’

master

new-branch

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Branching

master

new-branch $ HEAD

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Branching

$ git checkout master

master

new-branch

$ HEAD

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Branching

$ git checkout -b another

master

new-branch

$ HEADanother

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Branching

$ git commit -m ‘‘e’’

master

new-branch $ HEADanother

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Merging

$ git merge new-branch

master

new-branch $ HEADanother

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Merging

master

new-branch

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Merging

master

new-branch

$ HEADanother

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Merging

$ git merge master

$ Nothing to do! a

master

new-branch

$ HEADanother

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Merging

$ git checkout master

master

new-branch

another

$ HEAD

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Merging

$ git merge another

master

new-branch

$ HEADanother

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Merge conflicts

CONFLICT (content): Merge conflict in

the-file.txt

Automatic merge failed; fix conflicts and then

commit the result.

In the-file.txt :<<<<<<< HEAD

The current branch’s contents

=======

Stuff from the branch you’re merging

>>>>>>> new-branch

$ git add the-file.txt and $ git commit

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Looking at stuff

• $ git log Show a log of commits

• --graph Neat ASCII graph

• -p Show what changed in each commit

• $ git diff Show uncommitted changes

• $ gitk Graphical log

• --all Show all branches

• $ git gui Graphical tool for committing

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Working with remotes

• $ git clone <REPO URL> makes a copy of a repository.

• $ git push Pushes changes from your current branch tothe remote branch it tracks.(You may need to run$ git config --global push.default simple .)

• $ git pull Pulls changes from the remote branch andmerges them into your current branch.

• $ git remote add <REMOTE NAME> <REPO URL> addsa remote to an existing repository.

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Collaboration

• You and your co-workers are working on a projectsimultaneously

• You clone the company’s repository:$ git clone https://git.company.com/project.git

• $ git checkout -b doug to create your owndevelopment branch

• Modify files, $ git add <FILENAME> to stage them,

$ git commit when they are in a working state.

• Ready to merge with mainline?$ git checkout master and $ git merge doug .

• Your work is now merged with your local master branch(but not on the company’s repo).

• Question: which branch is HEAD now pointing to?

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Collaboration

• Meanwhile, your co-workers might have made changes!

• First, $ git pull to fetch and merge their changes

• Rectify merge conflicts, test the code, then$ git add <FILENAME> to stage, and then

$ git commit when in a working state

• Only after pulling and merging the most recent changesshould you $ git push

• Your work is merged with that of your co-workers, andnow resides on the company repo

• Take a coffee break.

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Outline

Introduction

Distributed

Snapshots

Storagelandscape

Using Git

Gitting started...

commit

branch

Merge conflicts

Exploration

Remoterepositories

Industrialworkflow

Final tips

Git Tips

• Make your commit messages descriptive!

• Only $ git commit when the code works!

• Don’t add generated files (like a.out ) to your repo.

• You can ignore certain files by putting their names in a.gitignore file in your repo.

• When collaborating, work on separate branches and mergeas you go along.

• $ git help COMMAND will show you documentation.

Lab 3: Version control and collaboration...What is version control? Distributed Snapshots Storage...

Documents

Transcript of Lab 3: Version control and collaboration...What is version control? Distributed Snapshots Storage...

CLUSTER OF EXCELLENCE MERGE - European Commission€¦ · CLUSTER OF EXCELLENCE MERGE Merge Technologies for Multifunctional Lightweight Structures 19 -chemnitz.de/MERGE Composites

On the Nature of Merge: External Merge, Internal …home.uni-leipzig.de/muellerg/citko05.pdfOn the Nature of Merge: External Merge, Internal Merge, and Parallel Merge Barbara Citko

TortoiseMerge - A diff/merge tool for Windows...Simon Large. TortoiseMerge: A diff/merge tool for Windows: Version 1.13 by Stefan Küng, Lübbe Onken, and Simon Large ... This happens

Simpo PDF Merge and Split Unregistered Version - …jclr.atu.ac.ir/article_847_abd9dc43c59e6d7fd6a4ccd96e...115-143 ص ،1393 ﺰﯿﯾﺎﭘ ،ﻢﺘﺸﻫ هرﺎﻤﺷ ،مﻮﺳ

Simpo PDF Merge and Split Unregistered Version - … · 2018. 10. 5. · Simpo PDF Merge and Split Unregistered Version -

PST Merge Software - Merge Multiple Outlook PST Files

Simpo PDF Merge and Split Unregistered Version - http ...applications.emro.who.int/imemrf/J_Fac_Med_Baghdad/J_Fac_Med... · Simpo PDF Merge and Split Unregistered Version ... Case

IHS Patient Merge · IHS Patient Merge is a modified version of the Veterans Administration ... All approved record pairs are included in a merge process when scheduled; ... nonreversible

Distributed Version Control with Git · Gitting Started Commands git init - Create an empty git repository or reinitialize an existing one git status - Show the working tree status

Merge Sort and Recurrences - UTKweb.eecs.utk.edu/.../2-Jan-14-Mergesort-Recurrences-no-answers.pdf · Merge Sort and Recurrences . COSC 581, ... using merge sort. • Combine: Merge

AFDKO Version 2.0 Tutorial: mergeFonts, rotateFont & autohint€¦ · % mergeFonts font.out font.src map1.merge font1.merge \ map2.merge font2.merge N OTE: By default, all glyphs

Simpo PDF Merge and Split Unregistered Version - http ...applications.emro.who.int/imemrf/J_Fac_Med_Baghdad/J_Fac_Med... · Simpo PDF Merge and Split Unregistered Version ... The

Duplicate Record Merge: Patient Merge Technical Manual€¦ · Web viewPATIENT MERGE. TECHNICAL MANUAL. Version 7.3. April 1998. Revised November 2009. Department of Veterans Affairs.

IHS Patient Merge · IHS Patient Merge (BPM) Version 1.0 User Manual Merge Process Overview March 2010 5 • Utilities are available for pausing and restarting the merge process.

Version Control for the 2- Pizza Team: Merge Conﬂicts€¦ · 2. Use branch only for changes needed for this feature, then merge into master" 3. Back out this feature undo this

AutoFill and Mail Merge - ALASBO Autofill_Mail_Merge.pdfPreview Merge ! Finish WORD 2010: MAIL MERGE! Choose Source (Recipients) ! Edit Recipient List ! Insert Fields ! Preview Merge

Version Control: Gitting Started - Hua Zhouhua-zhou.github.io/teaching/st790-2015spr/gitslides-Cai...Workflows of Git Modify les in working directory. Add snapshots of them to staging

Thinking Big: To merge or not to merge

Tabs3 Report Writer Version 17 Manual · 2019. 11. 12. · variable length field format, MS Word mail-merge format, dBASE format or WordPerfect merge format. The Forms Writer portion

Mail Merge Magic! Using Mail Merge for Student Certificates