Closed kalaspuffar closed 3 years ago
Seemed that I did a lot of whitespace changes without meaning to. Do you want me to change that or should we use the GitHub feature for whitespace?
It looks like the entire nordic2020-1.sch file has been changed unless I enable the whitespace option. If its not too much trouble, it would be nice if you could revert the lines that wasn't really changed.
Hi @josteinaj
I've also removed the auto line endings in git to allow the Windows line endings the nordic2020-1.sch file uses.
Best regards Daniel
Hi @josteinaj
Added rules to handle
Best regards Daniel
I think the only issue remaining for this PR is that we need feedback from @AndersEkl and/or @martinpub about the maintitle issue.
EDIT: see also https://github.com/nlbdev/epub3-guidelines-update/issues/86#issuecomment-786576912
Hi @josteinaj
Great suggestion, It makes no sense to have multiple main titles. I've changed the logic only to allow one uniquely defined main title or only one title.
Best regards Daniel
@kalaspuffar: The changes looks good now. However: "This branch cannot be rebased due to conflicts: Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch."
Could you rebase your local opf_updates
branch onto nlbdev:guidelines-revision
and force-push over kalaspuffar:opf_updates
, so that it becomes possible to merge this branch?
Hi @josteinaj
I have now rebased the files.
Best regards Daniel
Hi @josteinaj
Changes made:
Best regards Daniel