toddlers/merge.md

Forked from pablitoc/merge.md

Last active August 29, 2015 14:24

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/toddlers/c369ff66ca57ffc3cb5d.js"></script>
Save toddlers/c369ff66ca57ffc3cb5d to your computer and use it in GitHub Desktop.

Raw

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

clone your repo, I use the name of the gist

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

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
```
pull and merge the new remote into master
```
 git pull aaron master
```
push the changes
```
 git push
```

Select an option