merge conflict for every changelog in commit
pls stop to put changelog update into commit there is git conflict EVERY TIME you want to revert ANYTHING
example
git revert b2126c2b error: could not revert b2126c2b... Apply UVControllers only for given UV Set (bug #4827 (closed)) hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' hint: and commit the result with 'git commit' both modified: CHANGELOG.md
updat changelog on release maybe..
Edited by wang ryu