From d6e3138a3de716e78a18dbdab4f09ad4960d4caf Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Fri, 13 Sep 2019 14:03:22 -0700 Subject: [PATCH 1/2] Use union merge on the changelog file. This keeps both sides of a conflict. It's essentially the same as removing the conflict markers. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 3426f1deeda..4cc803e8066 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ lib/emscripten/emtests/* linguist-vendored lib/spectests/spectests/* linguist-vendored +CHANGELOG.md merge=union From abd71aa1294963394480acd50d36f3caacd438d2 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Fri, 13 Sep 2019 14:05:51 -0700 Subject: [PATCH 2/2] Add changelog entry. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e83904d8269..01c7d0ef65a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Blocks of changes will separated by version increments. ## **[Unreleased]** +- [#788](https://github.com/wasmerio/wasmer/pull/788) Use union merge on the changelog file. - [#785](https://github.com/wasmerio/wasmer/pull/785) Include Apache license file for spectests. - [#786](https://github.com/wasmerio/wasmer/pull/786) In the LLVM backend, lower atomic wasm operations to atomic machine instructions. - [#784](https://github.com/wasmerio/wasmer/pull/784) Fix help string for wasmer run.