WRIMS-core-to-devops #11
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 04aa8bf.
this allows the IDE to pick up generated-src as java files for debugging and development
add generated-src to the java source sets
|
@adamkorynta The new "core-less-one" branch is here because I mistakenly created the "wrims-plugin" branch one commit too late -- i.e. after I'd copied the "wrims_plugin" source out of the "wrims_v2/wrims_plugin" directory. This gives us the branching point where we want it and should put RMA/wrims-devops at exactly the same point as CVM/wrims-devops. |
|
Do you know what happened with the files that were moved? They are all flagged as having modified lines making it hard to tell if they were changed or not. My guess would be a different encoding was used? |
|
I don’t know what happened, but your guess seems like a good one. I would have made the move on my PC in IntelliJ, and then pushed the result back to GitHub. That could have changed the encoding or the line endings.
From: Adam Korynta ***@***.***>
Sent: Thursday, February 8, 2024 5:05 PM
To: rmanet/cvwrsm ***@***.***>
Cc: Tom Evans ***@***.***>; Assign ***@***.***>
Subject: Re: [rmanet/cvwrsm] WRIMS-core-to-devops (PR #11)
Do you know what happened with the files that were moved? They are all flagged as having modified lines making it hard to tell if they were changed or not. My guess would be a different encoding was used?
—
Reply to this email directly, view it on GitHub<#11 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/BD63FKKJ3UXQ2LDRX4WJE3DYSVY3PAVCNFSM6AAAAABDAVST7CVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSMZVGE3TEMZRGQ>.
You are receiving this because you were assigned.Message ID: ***@***.******@***.***>>
|
adamkorynta
approved these changes
Feb 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging the wrims-core devlopment into the Feature/wrims-devops branch at RMS