Make CHANGELOG easier to merge and update dompurify #537
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 was referenced May 16, 2023
confused-Techie
approved these changes
May 19, 2023
There was a problem hiding this comment.
Absolutely on board with the changes to git in relation to our CHANGELOG since those conflicts will just keep popping up without it.
As for the dompurify changes, looks like tests are totally happy, so lets merge and get renovate to stop freaking out about it lol
|
Merging this one, since of course the changes are fantastic, and want to put a stop to the renovate PRs lol |
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.
An unknown-ish config in
.gitattributesis to override how things are merged. Using "union" for changelog means if both people add a line, it'll keep BOTH of them!