Skip to content

Instantly share code, notes, and snippets.

@imbstack

imbstack/Workflow.md

Created September 29, 2017 18:35
Show Gist options
  • Save imbstack/2b3ac32a38de46b12002388bad7064fe to your computer and use it in GitHub Desktop.
Save imbstack/2b3ac32a38de46b12002388bad7064fe to your computer and use it in GitHub Desktop.
Download ZIP
Workflow
Raw
Workflow.md

You'll have three repositories:

  1. Your local one checked out on your computer
  2. Your fork in github
  3. The "canonical" repo (this is just the main one under the taskcluster org. I call it canon)

On your local repo, you should have two remotes:

  1. origin: which points to your fork (e.g. git@github.com:imbstack/ec2-manager.git)
  2. canon: which points to the canonical repo (e.g. https://github.com/taskcluster/ec2-manager.git) Notice that my origin is set up with ssh so I can push to it easier and the canon is https which I think is the sort you will have access to.

Now, given that setup. To make patch for a PR:

  1. git checkout master
  2. git fetch canon
  3. git reset --hard canon/master
  4. git checkout -b
  6. git commit
  7. git push origin HEAD
  8. go to github and make the PR into the canonical repository
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment