add 'pulled from/into wrong branch'

[joshdutcher]

my text editor automatically trims trailing spaces, so that happened too I guess.

[RichardLitt]

Could you remove the lines with the trailing spaces and squash this commit?

I'm not sure about the credit line - it's not like this isn't publicly available information in the git man, anyway. What do you think, @k88hudson

[k88hudson]

Sorry for the delay @joshdutcher, thanks for doing this.

Personally I think this is standard procedure enough to omit the credit line, but I'm open to either way.

That said, if larger sections are used or need to be linked to, adding something to a "resources" section makes sense to me.

[joshdutcher]

I'm totally fine with removing the credit line, and I'll squash the commit.

[RichardLitt]

These lines shouldn't have been edited - the rest looks good. If you can add these back in, we're ready to go.

[joshdutcher]

Sorry about that - got the lines back in there.

[k88hudson]

@joshdutcher I did the same thing during a rebase hehe

[RichardLitt]

Landed! Thanks @joshdutcher

[joshdutcher]

Thank you. I use git lots at work but this was my first experience contributing to a project on github, so I appreciate the patience and guidance.

[k88hudson]

Awesome! Thanks so much for contributing 👍

[RichardLitt]

Oh man, welcome! Thanks @joshdutcher