title: Prevent automatic changelog merging
body: <p>I have the following setup:</p>
  <ul>
  <li>I use Keep a Changelog (<a href="https://keepachangelog.com/" rel="nofollow noreferrer">https://keepachangelog.com/</a>)</li>
  <li>I use Git with GitHub</li>
  <li>I follow the Gitflow Workflow</li>
  </ul>
  <p><strong>Precondition</strong>:
  The changelog is saved in a file named CHANGELOG.md in the develop branch which looks partly like the following:</p>
  <pre><code>## [Unreleased]
  - Feature2
  
  ## [1.0.0]
  - Feature1
  </code></pre>
  <p>Than I create a feature branch of it.
  In the feature branch a new feature 3 was added to the changelog:</p>
  <pre><code>## [Unreleased]
  - Feature2
  - Feature3
  
  ## [1.0.0]
  - Feature1
  </code></pre>
  <p>Afterwards a release was made from the develop branch and merged back to it, which looks like this then:</p>
  <pre><code>## [Unreleased]
  
  ## [1.1.0]
  - Feature2
  
  ## [1.0.0]
  - Feature1
  </code></pre>
  <p>If I now merge the develop branch into the feature branch the CHANGELOG.md file is merged automatically (without conflicts) and looks like:</p>
  <pre><code>## [Unreleased]
  
  ## [1.1.0]
  - Feature2
  - Feature3
  
  ## [1.0.0]
  - Feature1
  </code></pre>
  <p><strong>Problem</strong>: The auto-merge put the Feature3 on the wrong place (beneath 1.1.0 instead of Unreleased). To prevent this I found only one solution: marking this file as binary in .gitattributes (to always raise conflicts).
  But .gitattributes is not evaluated by GitHub.</p>
  <p><strong>Question</strong>: Keep a changelog, Git and GitHub seem like state of the art. Why does nobody else have the same problem? At least I couldn't find any question or solution about it.</p>
  <p>What is confusing me even more: A lot of people ask for the opposite of my problem. They get a conflict and want to auto-merge it with merge=union.
  Do I misunderstand something or is my approach wrong?</p>