Skip to content

Instantly share code, notes, and snippets.

@jdmorlan
Created October 13, 2016 14:58
Show Gist options
  • Save jdmorlan/6c2cca13e823143f3290504140ef8618 to your computer and use it in GitHub Desktop.
Save jdmorlan/6c2cca13e823143f3290504140ef8618 to your computer and use it in GitHub Desktop.
Git Merging Workflow
  1. Commit your work to branch

  2. git checkout master

  3. git pull

  4. git checkout [branch-name]

  5. git rebase master

  6. git checkout master

  7. get rebase [branch-name]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment