Skip to content

#61 - feature: new action to facilitate cascade merging when no conflicts exist.#74

Merged
jdaugherty merged 3 commits into
apache:asffrom
jdaugherty:feature/cascade-merge
Apr 23, 2026
Merged

#61 - feature: new action to facilitate cascade merging when no conflicts exist.#74
jdaugherty merged 3 commits into
apache:asffrom
jdaugherty:feature/cascade-merge

Conversation

@jdaugherty
Copy link
Copy Markdown
Contributor

Implements #61

@jamesfredley @matrei I plan to use this to keep our branches in sync on grails-core so there's less manual effort keeping versions in sync (where there's no merge conflict)

Copy link
Copy Markdown
Contributor

@matrei matrei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would save a lot of work.

I'm just a little worried that it will merge changes up that are not meant to be merged up.

There is the [skip merge] label (which name I think is to general, maybe [skip merge-up]?), but random people contributing will not know about this label. I puts a burden on the reviewer to also remember and think of this aspect.

@jdaugherty
Copy link
Copy Markdown
Contributor Author

@matrei the merge issue exists already today. We can always revert or review the merge as part of the release process. Technically, if you define the ordering backwards, it would support merge down too - that's why I didn't say merge-up or merge-down. Would skip merge-cascade make more sense then?

@jdaugherty
Copy link
Copy Markdown
Contributor Author

Also, I've been doing these merges for over a year now without issue so I'm proposing this automation to eliminate that manual task.

@jdaugherty jdaugherty force-pushed the feature/cascade-merge branch from 06ecaea to 01ea835 Compare April 22, 2026 12:06
@borinquenkid borinquenkid self-requested a review April 22, 2026 14:43
@jdaugherty jdaugherty merged commit 7f11e8d into apache:asf Apr 23, 2026
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants