diff --git a/.gitattributes b/.gitattributes index d6c5853d..c03a430f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -Changelog.md merge=union +unreleased.md merge=union diff --git a/Changelog.md b/Changelog.md index fc384055..25fb80a3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -16,7 +16,6 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) ## [Bridge 1.5.0] Golden Gate -* GODT-701 Try load messages one-by-one if IMAP server errors with batch load and not interrupt the transfer ### Changed * Updated go-mbox dependency back to upstream. diff --git a/unreleased.md b/unreleased.md index 020a36e6..2ad18751 100644 --- a/unreleased.md +++ b/unreleased.md @@ -4,5 +4,8 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) ## Unreleased +### Added +* GODT-701 Try load messages one-by-one if IMAP server errors with batch load and not interrupt the transfer + ### Changed * GODT-651 Build creates proper binary names.