Scribd
Upload
215 views1 page

Making Changes Reviewing Changes: Version Control Cheat Sheet For Git Workflows

This document provides an overview of two common Git workflows: a centralized workflow and a workflow using pull requests. The centralized workflow involves pulling changes from the remote, making local changes, committing changes, and pushing changes back. The pull request workflow involves creating a topic branch, making changes on that branch, publishing the branch, creating a pull request for review, and merging after approval. The document also includes a brief explanation of common Git commands.

Uploaded by

felm07
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
215 views1 page

Making Changes Reviewing Changes: Version Control Cheat Sheet For Git Workflows

This document provides an overview of two common Git workflows: a centralized workflow and a workflow using pull requests. The centralized workflow involves pulling changes from the remote, making local changes, committing changes, and pushing changes back. The pull request workflow involves creating a topic branch, making changes on that branch, publishing the branch, creating a pull request for review, and merging after approval. The document also includes a brief explanation of common Git commands.

Uploaded by

felm07
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
You are on page 1/ 1

Version Control Cheat Sheet for Git Workflows

Making Changes – centralised workflow Reviewing Changes – with pull requests


Git Git ❻ Create pull request

Origin Origin
❽ Complete merge ❼ Reviewers view the pull
Remote

Remote
request, reviews code,
❶ Pull ❶ Pull comments + approves

❹ Push ❺ Push
Client

Client
❷ Create

Local repo
❷ Modify Topic branch Topic ❸ Modify
File Local repo File
Branch

❸ Commit ❹ Publish topic branch + commit

Centralised workflow using the Directed Acyclic Graph (DAG) diagram Topic branch using the DAG diagram

C D Topic 1
Topic Branch

A B C Main
Origin master Local repo
A B Main
Origin master

Commands
git command git command line tool with a variety of commands.  everyday  branching  help
• commit (verb) all the staged local changes • branch [name] creates branch called name based on HEAD Type git -help on the command line for a complete list
• pull the latest changes from origin and merge into working • merge two branches of commands and arguments.
copies
• push commits changes to origin

Visual Studio ALM Rangers Solutions – http://aka.ms/vsarsolutions V3.2

You might also like