search

githubteacher / githubfordevelopers-april

GitHub for Developers Training
4 stars 11 forks source link

Does he still need to do a "git merge"? #156

Closed limeri closed 7 years ago

brianamarie commented 7 years ago

@limeri You're right - he didn't merge yet. Because of time, we're stopping before it's complete and moving on. He went over the hard part, so that you can practice after class if you'd like.

limeri commented 7 years ago

k, thanks. That felt incomplete however, cuz I was confused about completing the merge from a remote branch.

brianamarie commented 7 years ago

@limeri Ah, I see. You have a good point. There were a few things going on in that one. Do you feel OK about it, or do you have some questions?

limeri commented 7 years ago

I'm good, thanks.