search

nlbdev / nordic-epub3-dtbook-migrator

Tools for converting between a strict subset of DTBook and EPUB3.
http://nlbdev.github.io/nordic-epub3-dtbook-migrator/
GNU Lesser General Public License v2.1
8 stars 7 forks source link

Test book constructions #459

Closed martinpub closed 3 years ago

martinpub commented 3 years ago

Starting adding things to test book (see #450)

martinpub commented 3 years ago

Hi @kalaspuffar, don't know why an automatic merge is not possible here? I cannot see the conflicting files? https://github.com/nlbdev/nordic-epub3-dtbook-migrator/compare/guidelines-revision...martinpub:guidelines-revision. Any chance you can help out a less git-skilled friend? :)

kalaspuffar commented 3 years ago

Hi @martinpub

Are you done with this PR, or will you make more changes? I see that this one needs to be rebased to merge it. Can you do that, or do you want me to rebase and create a PR against your PR?

Best regards Daniel

martinpub commented 3 years ago

Thanks @kalaspuffar, I will still add more test construction so I guess we can leave this open for a little longer. Will probably get back to you regarding the rebase, as I'm not 100% sure how to do it.

martinpub commented 3 years ago

Seems like I got stuck in a loop here @kalaspuffar, thought I fixed it but apparently not. git help?

martinpub commented 3 years ago

Replaced by #468, but the merge problems are still there.