githubteacher / flaming-octo-meme

demo repo for today's Intermediate class
0 stars 5 forks source link

how do you know what branch you want to merge in master? #139

Open githubstudent opened 9 years ago

githubstudent commented 9 years ago

It depends on the operation you are trying to perform. In the example we just did, we were trying to update the local copy of our branch to match the remote copy - so we checked out our branch and did git merge origin/<branch-name>. Later we will learn other scenarios for git merge!