search

zotero / translation-server

A Node.js-based server to run Zotero translators
Other
121 stars 50 forks source link

Verify translator used for import test #90

Closed retorquere closed 5 years ago

retorquere commented 5 years ago

In light of the earlier discussion on what the tests represent: this change verifies the use of the translator that the tests were specified in.

retorquere commented 5 years ago

Does this mean I have to rebase to upstream/master :cry:?

dstillman commented 5 years ago

You can, but there are no conflicts, so it's not necessary. The advantage of rebasing is that it ensures that you've tested on the current version, but if there's no relevant functionality difference, it doesn't matter.

dstillman commented 5 years ago

Now there's a conflict, because you changed the same line that was changed on the master branch.

If this depends on the change in master, you need to rebase. If it doesn't, you don't, but then you can't change the same line.

dstillman commented 5 years ago

Thanks!