New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
4 3 4 hotfixes #40
4 3 4 hotfixes #40
Conversation
@will-moore, @aleksandra-tarkowska: Do we want to merge this now or wait until we've got a few more changes to merge in? |
@will-moore: it will be better to use ORIGINALMETADATA from constants.annotation than the original_metadata string cf. dfa4c05 |
@will-moore: in order to test that branch you will have to fix the merge conflict. Could you take care of that so we look at that PR? |
… into 4-3-4-hotfixes
I tried following the steps on UsingGit page to fix the merge conflict, but no merge conflict was flagged: jrs-macbookpro-25107:OMERO will$ git branch -D 4-3-4-hotfixes
|
@will-moore, @chris-allan, @joshmoore: merge locally and no conflicts. Tested by will and chris and nobody had issues. |
@will-moore, @chris-allan, @joshmoore: probably too old in history, I created a new branch from develop and cherry-picked the commits. |
All looking good. Merging. |
Robot build
Test 5.3: Tests as guest 2017 SV4
A couple of bug fixes