Skip to content

Instantly share code, notes, and snippets.

@lddsb
Last active February 21, 2019 15:17
Show Gist options
  • Select an option

  • Save lddsb/b56a616a81705f09509f83e7b5fec006 to your computer and use it in GitHub Desktop.

Select an option

Save lddsb/b56a616a81705f09509f83e7b5fec006 to your computer and use it in GitHub Desktop.
---
kind: pipeline
name: default

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