Skip to content

Instantly share code, notes, and snippets.

@tylerfowle

tylerfowle/merge.md

Forked from jt/merge.md
Created December 6, 2016 20:29
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 tylerfowle/533a6c8223fd3a5151e59b55520cc347 to your computer and use it in GitHub Desktop.
Save tylerfowle/533a6c8223fd3a5151e59b55520cc347 to your computer and use it in GitHub Desktop.
Download ZIP
Merge a forked gist
Raw
merge.md

If someone forks a gist and you'd like to merge their changes. Do this:

  1. clone your repo, I use the name of the gist

     git clone git://gist.github.com/1163142.git gist-1163142

  2. add a remote for the forked gist, I'm using the name of my fellow developer

     git remote add aaron git://gist.github.com/1164196.git

  3. pull and merge the new remote into master

     git pull aaron master

  4. push the changes

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