I didn't see the same error Eric got when I tried to merge gh-pages and stats-update

githubteacher / githubfordevelopers-april

GitHub for Developers Training

4 stars 11 forks source link

Closed limeri closed 7 years ago

limeri commented 7 years ago

It looks like I checked out incorrectly:

$ git branch --all

gh-pages readme-update stats-update remotes/origin/HEAD -> origin/gh-pages remotes/origin/game-instructions remotes/origin/gh-pages remotes/origin/shape-colors remotes/origin/stats-update

brianamarie commented 7 years ago

@limeri I'm not sure I understand - what are you expecting to see differently?

limeri commented 7 years ago

I think I got it.

limeri commented 7 years ago

I had both local and remote branches called "stats-update". I checked stats-update out wrong because I created a local version.

brianamarie commented 7 years ago

Ah, I see. Do you have more questions, or did you figure it all out?

brianamarie commented 7 years ago

I'm going to close now, but please feel free to reopen or open a new issue if you have more questions. 👍