title: fixing the git rebase
body: <p>I have changes on my code, while my teammate also has changes on their part
  I made a commit, the same as theirs, so we end up changing most of the files</p>
  
  <p>After pushing his branch, and then I pull it,</p>
  
  <p>I got this message from git bash.</p>
  
  <pre><code>First, rewinding head to replay your work on top of it...
  Applying: Fixed the account control problem
  Using index info to reconstruct a base tree...
  M       application/views/templates/header.php
  .git/rebase-apply/patch:417: trailing whitespace.
  &lt;?php
  .git/rebase-apply/patch:418: trailing whitespace.
  defined('BASEPATH') OR exit('No direct script access allowed');
  .git/rebase-apply/patch:427: trailing whitespace.
  $autoload['libraries'] = array('ion_auth');
  .git/rebase-apply/patch:436: trailing whitespace.
  $autoload['helper'] = array('form');
  .git/rebase-apply/patch:451: trailing whitespace.
  $config['tables']['groups']          = 'groups';
  warning: squelched 772 whitespace errors
  warning: 777 lines add whitespace errors.
  Falling back to patching base and 3-way merge...
  Auto-merging application/views/templates/header.php
  CONFLICT (content): Merge conflict in application/views/templates/header.php
  error: Failed to merge in the changes.
  Patch failed at 0001 Fixed the account control problem
  The copy of the patch that failed is found in: .git/rebase-apply/patch
  
  When you have resolved this problem, run "git rebase --continue".
  If you prefer to skip this patch, run "git rebase --skip" instead.
  To check out the original branch and stop rebasing, run "git rebase --abort"
  </code></pre>
  
  <p>The problem is, git display files unstaged and when I tried to commit it, I cannot continue rebasing, if I ran, git rebase --skip, files I pulled also lost.</p>
  
  <p>What is the proper solution to this? this is the first time I encounter it.</p>