Skip to content

Commit 9382183

Browse files
committed
Update changelog
- Add all PRs/issues to CHANGELOG.md - Add gitattributes merge=union for CHANGELOG.md This should avoid most merge conflicts - Try merge=union for release notes - Remove dupes from changelog - Update credits and add chroot to releasenotes - Remove bad releasenotes info As a result of porting to master there were extra bits of information that got in before the actual changes. These have been removed.
1 parent fb36d86 commit 9382183

File tree

3 files changed

+259
-100
lines changed

3 files changed

+259
-100
lines changed

Diff for: .gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CHANGELOG.md merge=union
2+
docs/topics/release/* merge=union

0 commit comments

Comments
 (0)