[dspace-tech] Problem with merge branch main (8.0-SNAPSHOT) with branch desarrollo (tag dspace-7.6.1)
Hello! I wanted to consult the following: I'm working with a git clone tagged dspace-7.6.1 but I have conflicts when I want to do a merge with the main branch (after updating the files I can't get the DSpace up again). Therefore I avoid the merge with main on the development machine and do git push from the development branch to the remote repository. I use command git push -u origin development. On GitHub I do not have this branch created so I have nothing to compare with to make a Pull Request. What am I doing wrong? I also want to stay working only with Dspace version 7.6.1 (tag dspace-7.6.1) and continue syncing with bug fixes for this version. In the main it already appears as 8.0-SNAPSHOT DSpace Parent Project. I don't want to move to this version yet. I hope you have been able to understand me. Thank you. Greetings. Emilia.- -- All messages to this mailing list should adhere to the Code of Conduct: https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx --- You received this message because you are subscribed to the Google Groups "DSpace Technical Support" group. To unsubscribe from this group and stop receiving emails from it, send an email to dspace-tech+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/dspace-tech/9878bc67-d244-421e-a99a-f22e0065f0b8n%40googlegroups.com.
[dspace-tech] Subject keywords: choice of free text or controlled vocabulary
Hello, This is a subject keywords question (and apologies if I missed this answer somewhere else in the group!): We are not seeing how to set up the field so we can add either free text *or* select from the controlled vocabulary (srcs)? This is how our field currently looks: [image: Screenshot 2024-04-05 at 10.09.30 AM.png] Thanks! Julia -- All messages to this mailing list should adhere to the Code of Conduct: https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx --- You received this message because you are subscribed to the Google Groups "DSpace Technical Support" group. To unsubscribe from this group and stop receiving emails from it, send an email to dspace-tech+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/dspace-tech/f3e49a55-aecc-42bc-9adf-190924bb0272n%40googlegroups.com.
[dspace-tech] Re: Subject keywords: choice of free text or controlled vocabulary
Hello Julia. You can enter free text by simply typing it in the text box and then pressing the TAB key to add other keywords. You can also comment on the controlled vocabulary line. Greetings. Emilia.- El viernes, 5 de abril de 2024 a las 11:56:42 UTC-3, Julia Gilmore escribió: Hello, This is a subject keywords question (and apologies if I missed this answer somewhere else in the group!): We are not seeing how to set up the field so we can add either free text *or* select from the controlled vocabulary (srcs)? This is how our field currently looks: [image: Screenshot 2024-04-05 at 10.09.30 AM.png] Thanks! Julia -- All messages to this mailing list should adhere to the Code of Conduct: https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx --- You received this message because you are subscribed to the Google Groups "DSpace Technical Support" group. To unsubscribe from this group and stop receiving emails from it, send an email to dspace-tech+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/dspace-tech/7048f7a5-ef76-49ce-9313-12141af3837bn%40googlegroups.com.
