Changes to the report

[linarietuma]

I've made a start on the Methods and Discussion bit, and I've added a paragraph to the program development rationale (I've clearly messed up merging/ fetching branches somewhere along the way). This is still very much a draft but I won't work on it until tomorrow so just wondering how do we manage version control of the report file? Do we merge 'in progress' versions into main or keep branching off of the most 'up to date' branch (in which case ignore the pull request)?

[kymckay]

@linarietuma re: managing version, good question, if we were gonna be super strict we would just always branch off main and resolve merge conflicts as we go (they shouldn't happen unless we both edit the same section at the same time).

However, let's just merge in progress versions since the report is an in progress document as it stands. We can treat pull requests as a check to ensure no typos and so that we both see what's changing in the document.

[kymckay]

Aha it's not the line endings, I think it's something to do with the branch base.

Good thing I checked locally anyway, was a slight issue with the figure causing compilation errors but fixed that.

The graph text is perhaps a bit small we may want to look at scaling that up in future (not the figure itself, but just the text in the image).

[kymckay]

Okay yeah the git history of this branch is all messed up, I guess you must have branched off of a point from before we merged other pull requests, not entirely sure how this has happened.

The easiest solution is probably just to squash all these commits into a single commit and then hopefully the diff makes sense from that point on

[kymckay]

Merging now:

• I squashed the commits to fix the branch weirdness
• The line endings were an issue, but it was from my original commits. I've fixed my local setup now.
• I may have misunderstand what was happening with the \subfigure directive and it was part of the float package I don't have, that can be resolved in a future PR