Skip to content
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

ometa (squashed history) #193

Merged
merged 66 commits into from
Jan 21, 2022
Merged

ometa (squashed history) #193

merged 66 commits into from
Jan 21, 2022

Conversation

joshmoore
Copy link
Member

@joshmoore joshmoore commented Jan 11, 2022

Like #192 but with history and #192 but with initial commits squash:

  • the initial non-user-scripts history has been squashed with git rebase -i --rot
  • followed by rebasing the reset on top of the squashed commit with git rebase -i --rebase-merges --onto squashed-history cb4f07f HEAD

cc: @will-moore @sbesson


Original description from @CFGrote:

This PR adds scripts originally maintained by @evenhuis to support bulk annotation via csv files and dataset descriptions. The original code was ported to python3, bugs fixed and rudimentary tests added.

Marked as Draft here and seeking feedback and contributions from @will-moore , @ahamacher and others as discussed in this images.sc thread.

This was referenced Jan 11, 2022
@will-moore
Copy link
Member

Thanks @joshmoore.
This good to merge too now?

@joshmoore
Copy link
Member Author

Yup. Merging and I'll look into enabling CODEOWNERS. Everyone can help to remind me to get this into the release notes, and do the social media 🎉

Thanks, @evenhuis and @CFGrote, and welcome to the repo! 🙂

@joshmoore joshmoore merged commit fcffdf0 into ome:develop Jan 21, 2022
@joshmoore joshmoore deleted the ometa-squashed branch January 21, 2022 08:04
joshmoore added a commit to joshmoore/omero-scripts that referenced this pull request Feb 7, 2022
Follow on to ome#193 to allow @CFGrote to maintain the files
that were contributed to the central repository.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants