Skip to content

agraham0925/gitflow-workshop

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

30 Commits
 
 
 
 

Repository files navigation

Git and Gitflow Workshop

GIT FLOW + COMMON COMMANDS

Create Branch

  • git branch
  • git branch [branchname]
  • git checkout [branchname]
  • OR instead of the two separate commands, you can do git checkout -b [branchname]

Complete Task + Commit

  • git status
  • git add . OR git add -A
  • git status
  • git commit -m "Commit Message"

Push to Remote

  • git push -u origin [branchname]

Pull Request

  • Go to GitHub and click on branches
  • Find your [branchmame]
  • Create pull request
  • SOMEONE ELSE - 1-2 group members should approve your pull request and merge the branch/pull request into the remote master branch

Pull the Updated Remote Master & Get the Changes onto Your Branch

For everyone else in your team who needs the updated Master

  • commit changes on your local branch (see Complete Task + Commit)
  • git checkout master
  • git branch (ALWAYS do this to confirm which branch you're on!)
  • git pull
  • git checkout [branchname]
  • git branch (ALWAYS do this to confirm which branch you're on!)
  • git merge master
  • resolve merge conflicts + repeat

add'l resources for practicing git and git flow:

reading resources:

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

 
 
 

Languages