search

wics-uw / website

The code that runs http://wics.uwaterloo.ca/
Other
9 stars 49 forks source link

Squashing Commits Instructions unclear in README #253

Open annalorimer opened 8 years ago

annalorimer commented 8 years ago

Problem:

evykassirer commented 8 years ago

hm I think after the first time you push, it'll know what "push --force" means (at least, I only have to say git push)

but great points! we haven't actually specified when they should be squashed, but I like the idea of it happening at the end because then you can see the difference between commits as you go and what things you fixed

annalorimer commented 8 years ago

For me it didn't know where to push to for "git push --force", although it's entirely possible there was something else wrong.

I agree about doing it at the end.

evykassirer commented 8 years ago

ah, yeah

every time I do git push the first time it's like "did you mean git push ....... and then I copy paste that and forget about what it was :p we could explain this better

fboxwala commented 8 years ago

We had similar problems with the page in the git workshop, and Elana added helpful info to it. Could copy paste from there to README or link there from readme?

annalorimer commented 8 years ago

Just went through the instructions again for a recent pull request. The paragraph is really dense and hard to parse.

Also, the simple git push --force does not work. It needs to be git push origin BranchName --force.

arshiamufti commented 8 years ago

I'll take this on. I also propose we pull all the git related stuff from the README into a second file--it takes ages to find stuff on it.