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
   

How to merge two gist into one gist after regular time interval?