Skip to content

Instantly share code, notes, and snippets.

@sp00m

sp00m/block14.text

Created June 7, 2018 20:41
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save sp00m/63402355ca604e093f3a4fe6de68631a to your computer and use it in GitHub Desktop.
Save sp00m/63402355ca604e093f3a4fe6de68631a to your computer and use it in GitHub Desktop.
Download ZIP
Raw
block14.text
Time Branch “develop" Branch "features/foo" Branch "features/bar"
------- -------------------------------- ------------------------------- -----------------------------------------
15:10 git merge --no-ff features/bar
15:09 git merge --no-ff features/foo
15:08 git commit -m “Sixth commit"
15:07 git cherry-pick -x <second_commit_sha1>
15:06 git commit -m “Fifth commit"
15:05 git commit -m “Fourth commit"
15:04 git commit -m “Third commit"
15:03 git commit -m “Second commit"
15:02 git checkout -b features/bar
15:01 git checkout -b features/foo
15:00 git commit -m “First commit"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment