About Me

DevOps@RajeshKumar.xyz

Command Line or GUI?

Command Line vs. GUI

Why Git?

Killer Feature

Do You See the Problem?

This Is What happened

Still Not Convinced?

Git

Tools - Why Is It Hard to Learn Git?

• Many - command line being widely used
• Can be hard - especially if used to IDE
• Others tools are not very good
• Atlassian SourceTree is here to help!

Git Is Hard

"Early versions of Git did require certain amount of brain power to wrap your mind around..."

Git

Get Started

Don't Get Scared

Why Git with a Gui?

Demo

How Do I Get Source Tree?

Free!

Takeaway

Mechanics of Using Git (With a GUI)

---

Beyond Learning Git's Commands & Actions

Git 101: What You Need to Get Started Work

Quick Tour Around Atlassian Source Tree

Menus, Dropdown and Commands

icons

Getting the Code

Basic Concept: Clone Out vs. Fork

Fork

Clone

Cloning: Bit Bucket with Source Tree

Organizing Your Workspace

Demo

Getting the Code

Development Line of Work

Understanding Branches

Branching

Branches

Where Can I Branch

Demo

Branching

I Coded Now What?

I Coded - Now What?

The Three States of Files

Sections of a Git Project

Preparing the Commit: The Index

• Staging area
• Why not directly?
• Hunks: Add files or pieces of files
• Review
• Preparation area
• To be included in next commit
• Resolve conflicts

Whistle While You Work

Discarding Changes

• Mistakes happen
• Discard changes since last commit
• Careful when using it
• Is a destructive operation

Discarding changes

Stash

• Code mess?
• But need to save changes
• Without committing
• Like a shelveset in TFS
• Can be reapplied later

Stash

Reapplying a Stash

• Get back that piece of code
• From your Stash
• Into Working Copy

Demo

Discard and Stash

Demo

Ignoring Files

Staging & Hunks

Why Are I lunks Amazing?

Demo

Staging and Hunks

Commit Messages

Seven rules of a great Git commit message

• Separate subject from body with a blank line
• Limit the subject line to 50 characters
• Capitalize the subject line
• Do not end the subject line with a period
• Use the imperative mood in the subject line
• Wrap the body at 72 characters
• Use the body to explain what and why vs. how

:hris Beams, Tim Pope, Peter H utterer, Git Pro book and posts in GitHub projects...

A Great Commit Message

If applied, this commit will

Commit

Save the staged snapshot to the Droject repository

Commit

Demo

Commit

Merging

• Join two or more
• Development branches
• Part of the workflow
• Work, commit, and...
• Merge a branch
• (Or many)

Pull First

• Your responsibility to avoid conflicts
• Pull first
  • Fetch and Merge into your branch
• And then merge
  • Pull Request

Demo

Merging

Push

• Pushed to remote repository
• Deployed, reviewed, integrated,
• Upload: Commits, branches, tags,
• Hooks
• Avoid conflicts
• Pull Request

Demo

Push

Merge Conflicts

• Changes in same area
• In different branches
• In the same line or lines
• Or edit a file that is deleted elsewhere
• Merge conflict
• Which one to pick?
• Resolve

Conflicts

Mine or Theirs

• Pick one of the changes
• One change is latest
• Careful not breaking other branch

Resolve Manually

• Manual resolution required
• Pieces of both changes may be required
• Make sure both branch changes work
• Leverage external tool

Demo

Conflicts

Pull Request

• Or as I call it
• Here's My Code
• Please Take It

Pull Request

• Method of submitting code
• To a project
• Distributed source control
• Review changes
• Collaborate and improve
• Before merge
• Accepted or rejected

And After The Pull Request...

• You may need to wait for merge
• Maintainer needs to OK
• Especially in open source
  • Some are pretty quick!
• Sometimes you need to improve
• It is collaboration time

Once You Get The OK...

Demo

Pull Requests

Cleaning Up

Delete branch after merging

Demo

Deleting Branches

Cleaning Up

Takeaway

Git: To the Next Level (With a GUI)

---

"Small commits allow for big wins"

Cherry Pick

• Really useful command
• N'love single(or specific) commit(s)
• From one branch to another
• Why not a merge?
  • You may not want everything
  • Incompatibilities<
  • Specific feature in out of date branch

Demo

Cherry Pick

Blame

• Helps determine who made changes
  • And why
History tells you files and changes Last modification for each line Revision and author Known as annotate in TFS

Search

Demo

Blame and Search

Merging vs. Rebasing

Merging vs. Rebasing

Demo

Merging vs. Rebasing

Demo

Fast Forward Merge

Demo

Tagging

Demo

Detached Head

Rebase Interactively

Demo

Reordering Commits

Demo

Editing and Amending Commits

Squash Commit Messages

• Not about file revisions
• It is about "Qverview"
• What bug is fixed?
• What feature done?

Demo

Squash Commits

Deleting a Commit - Reset

Deleting a Commit - Reset

Demo

Deleting Commits

Demo

Reverse Commit

Demo

Recovering Deleted Commits

Demo

Custom Actions

Takeaway

Branching Strategies For Every Occasion

---

Branching Strategies for Every Occasion

Starting with Git: Branching 101

Git Workflows

Centralized Workflow: Advantages with Git

Centralized Workflow: Working

There is a secret to making it all work

Rebasing is the Key

Centralized Workflow: Rebasng

• Add your changes in a linear way to origin/master
• Focused changes
• Clean history

Centralized Workflow

Problem with Centralized Workflow

Problem with Centralized Workflow

• Code in master always deployment ready?
• Work in progress on a feature?
• Collaborating on a feature?
• Prevent broken code in master?
• Caveats present in other source control systems

Integration: BitBucket, Jira & Bamboo

Feature Branch: A Branch for Every Feature

Gitflow: Brilliant!

That's what I think...

Gitflow Workflow

• Great complex projects
• As well as small projects
• Brilliant organization of your work stream
• Simplifies complex source code management
• Feature / Hotfix / Release
• Parallel
• Distinction: Development vs. Production Ready
• How did I lived without it?

Gitflow Workflow: Main Branches

master

• origin/master HEAD → Production Branch
• Production Release:
  • Merge stable develop into master via Release Branch and Tag

develop

• origin/develop HEAD → Integration Branch
• Latest dev changes
• Nightly build
• Only merge completed features

Infinite lifetime!

Gitflow Workflow: Supporting Branches

Teams can work in parallel

Without much disruption

Feature Branches

• A branch for every feature
• Start by branching develop
• Exists while in development
• Recommended in local repo
  • ↑origin: backup | collaboration
• Ready?
  • Merge when done a.k.a. "Topic" branches

• Branch off from
  • develop
• Merge back into
  • develop
• Can be named anything except:
  • master, develop,
  • re/ease-*, hotfix-*

Release Branches

• Support preparation production release
  • Branch almost production ready
  • Can work on minor bug fixes
  • Update metadata (version info)
• Work can continue on develop
• Ready?
  • Merge into master
  • Tag release and delete branch

• May branch off from:
  • develop
• Must merge back into:
  • develop and master
• Branch naming convention:
  • release-*

Hotfix Branches

• Prepare release (Unplanned! � React)
• Fix a bug (or a few)
  • While team keeps working
• Ready?
  • Update metadata
  • Merge into master & develop
    • Except if release branch exists
    • Merge into release branch
  • Delete branch

• May branch from
  • master
• Must merge back into
  • develop and master
• Potentially release
• Naming convention
  • hotfix- *

Using GitFlow from SourceTree

Demo

Gitflow Workflow

From Source Tree

Forking WorkfIow

• Important Difference
• Besides main repository
• Every developer (or team)
  • Server side repository (usually public)
  • Local (private)
• Push to their own server side repo
• Pull requests to main repository
• Perfect for open source!
• As well as enterprise

Forking Workflow

Forking from Repository

Repository Might Keep Evolving

Forking Workflow

Takeaway

Final Takeaway

---

Questions?

Thank You!

---