Skip to content

Instantly share code, notes, and snippets.

@kevinhooke

kevinhooke/gist:05aa2a492973415833123ca7708088fc

Created April 7, 2021 17:32
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 kevinhooke/05aa2a492973415833123ca7708088fc to your computer and use it in GitHub Desktop.
Save kevinhooke/05aa2a492973415833123ca7708088fc to your computer and use it in GitHub Desktop.
Download ZIP
git merges
Raw
gistfile1.txt
Fast Forward
- when no other changes made to master between the last change and the change you are about to merge on your branch,
master is 'fast forwarded' to point to your last commit that you are merging into master (no other changes to merge)
Merging a branch
- checkout target branch: git checkout targetname
- merge source into the target: git merge sourcename
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment