Why did the commands you used for resolving conflicts differ from github directions?

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 the commands you used for resolving conflicts differ from github directions? #681

Closed ringhilterra closed 8 years ago

ringhilterra commented 8 years ago

githubcommandline

uclabruins89 commented 8 years ago

jaw6 commented 8 years ago

The instructions GitHub provides for resolving a conflicted pull request will update the requesting branch with any changes from master (and, if you continue with Step 2, push the resolved merge directly into origin/master, resolving the pull request as a side-effect). In class, we're illustrating resolving a conflicted merge, a Git-level (not GitHub-level) operation that's likely to come up more often in day-to-day software development workflows.