rewords instructions to squash commits, addresses #253

arshiamufti commented 7 years ago

I still have to fix the width of the text and fix some markdown syntax, but I'm making the pr now so we can talk about the content. Changes I've made are:

rewording a lot of the text in the squashing commits heading
linking to this section whenever we reference squashing commits elsewhere in the README
I renamed to "pulling changes" section and moved it all the way up to the "making a pull request" section since that common error usually occurs when people are about to make a pull request and "pulling changes" sounded kinda vague to me. This isn't technically in the scope of this issue though.

evykassirer commented 7 years ago

@fat1996 can you review this?

fat1996 commented 7 years ago

@evykassirer Sure! @arshiamufti there's a reference to squashing in the "Reviewing a Pull Request" section under "Commits" which hasn't been linked to the section yet.

evykassirer commented 7 years ago

Actually we can take out stuff about squashing? We can just do it when we merge now.

annalorimer commented 7 years ago

@evykassirer I think we should keep it in there since it's still part of the workflow (even if it is on merge). We can update it to reflect that it gets done on merge.

wics-uw / website

rewords instructions to squash commits, addresses #253 #274