Skip to content

Instantly share code, notes, and snippets.

@Tiagojdferreira

Tiagojdferreira/merge.md

Forked from jt/merge.md
Created March 31, 2017 14:50
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 Tiagojdferreira/10d4cc8ff2895126269d249319646cf6 to your computer and use it in GitHub Desktop.
Save Tiagojdferreira/10d4cc8ff2895126269d249319646cf6 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