title: How to ignore unmerged paths?
body: <p>Currently I'm working with yii and I use git center repository, let's say in development config is set to localhost, and in production server config is set to server ip.</p>
  
  <p>I have modified file which need to commit</p>
  
  <pre><code>Changes to be committed:
    (use "git reset HEAD &lt;file&gt;..." to unstage)
  
          modified:   backend/modules/company/controllers/XyzController.php
  </code></pre>
  
  <p>When I commit, I get error </p>
  
  <pre><code>U       backend/config/main.php
  U       frontend/config/main.php
  error: Committing is not possible because you have unmerged files.
  hint: Fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  hint: as appropriate to mark resolution and make a commit.
  fatal: Exiting because of an unresolved conflict.
  </code></pre>
  
  <p>here is <code>Unmerged paths</code></p>
  
  <pre><code>Unmerged paths:
    (use "git reset HEAD &lt;file&gt;..." to unstage)
    (use "git add &lt;file&gt;..." to mark resolution)
  
          both modified:   backend/config/main.php
          both modified:   frontend/config/main.php
  </code></pre>
  
  <p>because it conflict with production server config when I pull from center repository.</p>
  
  <p>I have already include <code>backend/config/main.php</code> and <code>frontend/config/main.php</code> in <code>.gitignore</code> but no effect.</p>
  
  <p>so How can I solved it so I can commit only <code>XyzController.php</code> and push to remote?</p>
  
  <p>If I commit <code>backend/config/main.php</code> and <code>frontend/config/main.php</code> then it will included in push. and it think it will conflict when in production server I pull from center repository.</p>
  
  <p>Thanks in advance.</p>