title: git rebase merge conflict
body: <p>I forked a github repo and worked on my github repo.<br>
  I have made pull-requests and it was completed. </p>
  
  <p>After that the upstream had some more commits so now I want to rebase, I guess thats what I have to do.<br>
  But I'm getting these merge conflicts:</p>
  
  <pre><code>First, rewinding head to replay your work on top of it...
  Applying: Issue 135 homepage refresh
  Using index info to reconstruct a base tree...
  &lt;stdin&gt;:17: trailing whitespace.
        %h4 
  warning: 1 line adds whitespace errors.
  Falling back to patching base and 3-way merge...
  Auto-merging app/views/layouts/application.html.haml
  CONFLICT (content): Merge conflict in app/views/layouts/application.html.haml
  Auto-merging app/views/home/index.html.haml
  CONFLICT (content): Merge conflict in app/views/home/index.html.haml
  Auto-merging app/views/home/_group_projects.html.haml
  CONFLICT (content): Merge conflict in app/views/home/_group_projects.html.haml
  Failed to merge in the changes.
  Patch failed at 0001 Issue 135 homepage refresh
  
  When you have resolved this problem run "git rebase --continue".
  If you would prefer to skip this patch, instead run "git rebase --skip".
  To check out the original branch and stop rebasing run "git rebase --abort".
  </code></pre>
  
  <p>I don't know how to fix these, please help.</p>