title: Dealing with conflicts when merging from development to master
body: <p>I begun a workflow where I aim to do all new features in a <code>development</code> branch and the <code>master</code> branch will only be for production ready code.</p>
  
  <p>After doing the following:</p>
  
  <pre><code>git checkout master
  git merge staging
  </code></pre>
  
  <p>I received a bunch of conflicts looking like this:</p>
  
  <pre><code>CONFLICT (rename/add): Rename app/assets/stylesheets/mobile.css-&gt;app/assets/stylesheets/application.css in HEAD. app/...
  CONFLICT (modify/delete): app/views/organizers/mobile.html.erb deleted in HEAD and modified in staging. Version stagi...
  CONFLICT (modify/delete): app/views/events/mobile.html.erb deleted in HEAD and modified in staging. Version staging of app/v...
  </code></pre>
  
  <p>When I now have been googling this, all I read is about reviewing each and every file, resolving the conflicts and commit the changes. But I don't see any point in doing all this, as I know the code and it's only an advancement of the same code set.</p>
  
  <p><strong>How can I merge the changes done in <code>staging</code> into <code>master</code> in a simple manner without having to review and resolve each and every change?</strong></p>