Developer doc tidy 3 rebased #256
Conversation
Conflicts: developers/Clients/ImportLibrary.txt developers/Model.txt
Based on the notes I took while discussing the build and the server code in Dundee. * Add model-generation.png from the Nature paper * Merged TypeLanguage into Model * Added specifics comments about generated files Conflicts: developers/Model.txt developers/Server/ExtendingOmero.txt
|
@joshmoore This was breaking the docs because your DSL changes weren't on the develop branch but my dev_4_4 changes which I was rebasing were built on top of them, so I've cherry-picked your commit to fix it. Hope that is okay. |
|
@hflynn: works for the moment. Next time just give a shout and I'll rebase. Sorry for having forgotten! |
|
It's okay, by the time I'd figured out what the issue was it seemed as well to fix it myself. I don't know if there were any other commits on that PR you need to rebase though - I did this one because the image it added being missing was what broke the build. |
|
My PR had 2 other commits. Do you want to try cherry-picking those as well, and then we'll know for sure? |
|
I have it open anyway, so to be specific: https://github.com/openmicroscopy/ome-documentation/pull/242/commits |
Conflicts: developers/Model.txt
The changes are quite small but to maintain line lengths I formatted the paragraphs. Conflicts: developers/Model.txt
developers/Clients/ImportLibrary.txt
Outdated
There was a problem hiding this comment.
The final dot had been removed in 0fa2d57. While not doing it makes sense, this may cause conflicts in the future.
|
Apart from very minor comment above, the diffs are the same for the conflicting |
|
Have even fixed the tiny nitpick now - ready to merge. |
|
+:beer: |
Developer doc tidy 3 rebased
3 participants
This is PR #254 rebased to develop