search

githubteacher / github-for-developers-sept-2015

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

Why did we merge custom branch into master and not master into custom branch? #683

Closed Ziliboba closed 9 years ago

Ziliboba commented 9 years ago

Is it a better practice to merge master into custom branch and then push custom branch and try to merge PR once again? :trollface:

jaw6 commented 9 years ago

That's usually our recommendation (eg, it's typically best to merge from master into branch and push branch to update the pull request) but it's sometimes useful to show alternatives in class.