Closed bpar476 closed 6 years ago
@softeng-701
@bpar476 Please squash commits and resolve conflicts
I can't squish it properly because there are a bunch of other commits between mine. I've squished my changes into one commit but because the order is different now it thinks I'm adding all these new commits. It might be easier if you just choose "squash and merge" and let github do the squashing instead of me squashing other peoples' commits with mine.
@softeng-701
@bpar476 Why are there other commits, have you been working on the same branch?
The other commits are because I rebased. Those commits are already in master, they just look like different commits because of the rebase.
@softeng-701 yes.
All of the code in the files changed was done by me alone.
@bpar476 Yep all good, a few people have had this problem, just trying to get my head around it. If your commits are squashed together that's good enough
Cool :). All of my work is in the one commit: bf29c96.
Anything else before this can be merged @softeng-701?
@bpar476 Your group needs to review the PR
@bpar476 I'm just confirming the squashing requirements, will let you know. Cheers
At some stage during development, the scss file was abandoned. I have updated it with the up to date style from styles.css. Now there is no need to version control the generated .css file.
.css can be generated with the following command:
$ node-sass stylesheets/style.scss stylesheets/style.css
In light of the extra effort of converting the .css to .scss instead of just removing the scss, perhaps the issue could be upgraded from a small? @softeng-701
Fixes #101