search

githubteacher / github-for-developers-sept-2015

practice repo for the Sept 29-30 GitHub for Developers class
12 stars 36 forks source link

Wouldn't it be easier to 'merge origin/master' to github teacher branch and update the pull request instead of the other way around? #691

Closed jamie-cyber1 closed 8 years ago

Ziliboba commented 8 years ago

:+1:

sbrinkmeyer commented 8 years ago

:+1:

jmarlena commented 8 years ago

:+1:

jaw6 commented 8 years ago

Either direction works. We would usually recommend merging origin/master into feature (and that's what's recommended elsewhere) but in class, we wanted to illustrate a few other things in one go (including closing a pull request as a side effect of pushing changes into master).