Git Branching and Merging

https://www.pluralsight.com/courses/git-branching-merging

by Craig Golightly 

Module 1: Course Overview

  1. Course Overview

Module 2: Understanding Git Branch Basics

  1. About This Course
    • Github Default Branch Naming
      • Oct 2020 changed default from master to main
      • Organizations can set a default branch name
  2. Branching In-flight
    • 'git init' will create a new git repo
    • shows an example of creating a branch after making changes
      • 'git checkout -b {branch name}' will create a new branch and move pending changes into new branch
    • to switch back to main: 'git checkout main'
  3. Moving from Branch to Branch
    • 'git branch': List your branches
    • 'git checkout' or 'git switch' to swtich to a different branch
    • When you've made changes to a branch,  but you've not yet committed those changes to the branch (a dirty branch), Git won't let you switch from a dirty branch that has uncommitted changes until you clean up your changes.
    • 'git status' shows your current branch
  4. Renaming and Deleting Branches
    • to Rename a Branch - git branch -m <current name> <new name>
    • to rename current branch -  git branch -m <new name for current branch>
    • to delete a branch - git branch -d <branchname>
      • commits must first be merged
        • however, you can override by using the -D flag
Module 3: Merging Made Easy
  1. Comparing and Merging Branches
    • a simple merge is called a Fast Forward
    • to merge, checkout into target branch and exeucte 'git merge {source branch}'
  2. Understanding Git Diff
    • git diff <branchl> <branch2>
    • detailed explanation of diff output
  3. Using Git Diff
    • 'git diff' by itself only does unstaged files
    • 'git diff -cached' only diffs staged
    • 'git diff HEAD' both stagedand unstaged changes
    • 'dev/null' indicates a new file
    • 'git log --oneline' shows commit history
  4. Resolving Merge Conflicts
    • shows how to solve merge conflict
    • merge changes from parent frequently to avoid conflicts
  5. Aborting a Merge
    • you may want to abort a merge instead of fixing a conflict
Module 4: Using Git Branches with Your Team
  1. Setting up Remotes
    • shows how to fork and clone a repo
  2. Using Remotes with Code
    • explains difference between 'fit fetch' and 'git pull'
    • run 'git remote update' and then 'git status' to see changes to a remote
    • 'git pull' will do a fetch and merge
  3. Using Remotes with Branches
    • you don't always have to push to main, you can push your dev branch
      • git push -u origin feature4
    • 'git ls-remote' shows branched on remote
    • you have to use the 'track' flag for remote branches
      • git checkout --track origin/ feature4
  4. Using Pull Requests
    • pull request is not a feature of git
    • a demo of the pull request process on github
  5. Ignoring Files
    • .gitignore uses a regex like syntax
    • put .gitignore in root
    • to ignore files without using .gitignore, add it to '.git/info/excluse'
      • this will not get pushed to remote and will only apply locally
    • https://github.com/github/gitignore
      • A collection of useful .gitignore templates
  6. Setting Team Conventions
    • Frequent smaller commits vs. one giant commit
  7. Creating Code That Can Merge
    • Pick a formatting standard and stick to it
Module 5: Advanced Merging Methods
  1. Rearranging with Rebase
    • Rebase is an advanced feature
      • Not mandatory
      • It can cause problems
      • Do not rebase a public branch
    • you would use it to clean up your local history before sharing a branch
    • you would use it to pull changes from a branch into your branch without performing a merge
  2. Squashing Multiple Commits
    • rebase is squashing multiple commits into one
    • demo of using rebase to squash multiple commits into one
  3. Rebasing from Main
    • shows difference between git merge and git rebase
    • shows difference between "git pull" and "git pull --rebase"
  4. Using Cherry Pick
    • git cherry pick is when you take a specific commit and merge it, while merge brings all changes
    • Copy specific commits to another branch
      • Bugfix for multiple versions of product
      • Capture commits from inactive branch
    • Move specific commits to your branch
      • Features needed for your ticket
      • Branches not ready to merge yet
    • Creates duplicate commit in each branch
      • Can cause confusion
    • Cherry-pick is an advanced feature
      • Should not replace merge
  5. Cherry Pick Demos
  6. Conclusion

Comments

Post a Comment

Popular posts from this blog

Angular Routing and Navigation Playbook

Image
https://www.pluralsight.com/courses/angular-routing-navigation-playbook by Lara Newsom Course Overview Course Overview Course Introduction and Code Examples Course Introduction and Code Examples Basic Angular Routing Setup Introduction to Angular Routing Discussion: Angular RouterModule Exports Demo: Bootstrap Angular RouterModule Discussion: Declaring Routes angular has tow route path match strategies: prefix based or full match prefix is the default Demo: Declaring Default and Home Routes two options for declaring a default route: {path: ' ', componenet: DefaultComponent} {path: ' ', redirectTo: 'home', pathMatch: 'full'} Discussion: Child Routes and Route Order Demo: Declaring a Wildcard Route wild card routes is: path: '**' to enabled logging all navigation events to the console, enable tracing Demo: Hooking into Router Events Routing in Standalone Component Applications Introduction to Standalone Components and Routing Demo: Bootstrapping Ro...
Read more

Working with Files in C# 10

https://www.pluralsight.com/courses/c-sharp-10-working-files by Jason Roberts Course Overview Course Overview Sandbox Managing Files and Directories Introduction Creating a New Console App Checking if a File Exists you can use to check if file path is an absolute path: Path.IsPathFullyQualified Getting the Parent Directory of a Path Checking if a Directory Exists and Creating New Directories Copying a File Moving a File Getting the File Extension from a File Name Checkpoint 01- Get the Parent Directory for a Path Changing a Filename Extension Checkpoint 02 - Get the Extension Part of a Filename Deleting a Directory Enumerating All the Files in a Directory Summary Exercise 01- Copying and Deleting Files Monitoring the File System for Changes Introduction Introducing the FileSystemWatcher Class The IntemalBufferSize Property Configuring Notification Filters Additional Properties Refactoring to Use a FileSystemWatcher use FileSystemWatcher to watch for file changes in a folder Checkpo...
Read more

Mastering Git

https://app.pluralsight.com/library/courses/master-git/table-of-contents by Paolo Perrotta Module 1: Course Overview Course Overview Module 2: The Four Areas: Introduction Version Check About This Training A Note About the Command Line Introducing the Four Areas The Working Area The Repository The Index Module 3: The Four Areas: Basic Workflow Revisiting the Basics Moving Data to the Right Moving Data to the Left Removing Files Renaming Files A Quick Summary Module 4: The Four Areas: Git Reset Understanding Reset A Reset Example More Reset Examples Module 5: The Four Areas: Advanced Tools Stashing Data Solving Conflicts Working with Paths Committing Parts of a File Introducing Switch and Restore Git Is a Toolbox Module 6: History: Exploring the Past Becoming a History Surgeon Referencing Commits to show changes in a commit: git show HEAD to show changes in a commit parent: git show HEAD^ Tracking Changes in History Browsing the Log Module 7: History: Fixing Mistakes Reviewing the Golde...
Read more