Cherry-pick #10003 to 6.5: configure union merge for Changelog*.next.asciidoc #10026
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
* configure union merge for Changelog*.next.asciidoc This change automatically merges Changelog*.next.asciidoc files when merging or rebasing via `merge=union`. No more need to fix changelog files when doing `git rebase master`. * Remove union merge from Changelog.asciidoc (cherry picked from commit 05d7f5e)
ph
approved these changes
Jan 22, 2019
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…*.next.asciidoc (elastic#10026) Cherry-pick of PR elastic#10003 to 6.5 branch. Original message: This change automatically merges Changelog*.next.asciidoc files when merging or rebasing via `merge=union`. No more need to fix changelog files when doing `git rebase master`. Note: github UI seems to ignore the setting. Convenience will only be improved on command line.
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.
Cherry-pick of PR #10003 to 6.5 branch. Original message:
This change automatically merges Changelog*.next.asciidoc files when
merging or rebasing via
merge=union. No more need to fix changelogfiles when doing
git rebase master.Note: github UI seems to ignore the setting. Convenience will only be improved on command line.