• Skip to main content
  • Skip to primary sidebar
  • Skip to footer

Notes to Self

  • Aviation Weather from NOAA Plugin
    • KZZV
    • Bad Shortcode
    • Simple Metar
  • Meetings

Mark Chouinard / June 25, 2013

Git Workflow – Lynda/Skoglund

KS

  • git checkout master
  • git pull
    • git fetch
    • git merge origin/master
  • git checkout -b feedback_form
  • git add feedback.html
  • git commit -m “Add customer feedback form”
  • git fetch
  • git push -u origin feedback_form

LDC

  • git checkout master
  • git pull
  • git checkout -b feedback_form  origin/feedback_form
  • git log
  • git show 84j34df8
  • git commit -am “Add something else to feedback form”
  • git fetch
  • git push

KS

  • git fetch
  • git log -p feedback_form..origin/feedback_form
  • git merge origin/feedback_form  (fast-forward merge)
  • git checkout master
  • git pull
  • git merge feedback_form
  • git push

Filed Under: Version Control Tagged With: git

Primary Sidebar

Post Archives

  • June 2024
  • December 2022
  • July 2022
  • December 2021
  • October 2021
  • June 2021
  • February 2021
  • October 2020
  • September 2020
  • August 2020
  • March 2020
  • February 2020
  • December 2019
  • September 2019
  • June 2017
  • May 2016
  • April 2016
  • March 2016
  • September 2015
  • August 2015
  • February 2015
  • January 2015
  • December 2014
  • November 2014
  • October 2014
  • September 2014
  • August 2014
  • July 2014
  • May 2014
  • April 2014
  • March 2014
  • February 2014
  • January 2014
  • June 2013
  • May 2013
  • April 2013
  • February 2013
  • January 2013
  • December 2012
  • January 2011

Footer

Copyright © 2025 · machouinard · Log in