title: Two branch both modified, how to merge them correctly?
body: <p>I have a branch <code>DEV</code>, I created a branch <code>ESLINT</code> from it.</p>
  
  <p>The branch <code>ESLINT</code> is supposed to hold a huge coding-style modification (I had no coding style before, now I have one) so <strong>all the file</strong> are beeing modified on it (indentation, unusedd-var, illegal whitespaces, ...).</p>
  
  <p>During the work on this <code>ESLINT</code> branch, I had to add features in existing files &amp; new file to the branch <code>DEV</code> (new feature, not a super clean workflow for now so I develop new features directly on <code>DEV</code>).</p>
  
  <p>I'd like to kow how can I update <code>ESLINT</code> with the modification I done in <code>DEV</code> (new files &amp; new file content in existing files)</p>
  
  <p>I though of doing <code>git checkout ESLINT</code> then <code>git merge DEV</code> but I'm afraid of the mess it may create.</p>