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

6.2.x to 7.0.x merge #502

Closed
wants to merge 10 commits into from
Closed

6.2.x to 7.0.x merge #502

wants to merge 10 commits into from

Conversation

jdaugherty
Copy link
Contributor

No description provided.

codeconsole and others added 10 commits September 23, 2024 15:55
--refresh-dependencies
Allow optional attribute for g.render that will ignore if tag if template does not exist.
* revert github resolve merge conflict bug that resulted in 7.0.x merge into 6.2.x branch

* use grails-core:6.2.1-SNAPSHOT
@jdaugherty
Copy link
Contributor Author

Merges 6.2.x into 7.0.x - we should have zero files changed.

@codeconsole
Copy link
Contributor

no longer needed

@codeconsole codeconsole closed this Oct 3, 2024
@jdaugherty
Copy link
Contributor Author

@codeconsole you'll need to force push 6.2.x otherwise when we merge a branch off of 6.2.x in the future, the revert will be applied to the 7.0.x branch.

@codeconsole
Copy link
Contributor

@jdaugherty it was already done when I closed the ticket 👍

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.

3 participants