I see. In general it's a good idea to check your commits (as I mentioned
before, don't push files where the only change was a new line removed at
the end.) Occasionally, I use http://www.sourcetreeapp.com/ to view my
commits. I like it a lot.

Try

$> git rm <file>
$> git commit -m 'removed extra files'

and then push.


On Fri, Apr 5, 2013 at 9:28 PM, Wan Xin Teo <notifications@github.com>wrote:

> In app/views/polls/show.html.haml.orig:
>
> > +        .row
> > +          .twelve.columns#polls
> > +            - if @poll
> > +              .row
> > +                .six.columns
> > +                  %ul.button-group.even.four-up
> > +                    - @poll.question.choices.each do |c|
> > +                      %li= link_to c,
> > +                        poll_answers_path(@poll, answer: {answer: c}),
> > +                        remote: true, method: :post, class: 'button choice secondary'
> > +                    .errors
> > +<<<<<<< HEAD
> > +                  = link_to 'Back to question page', root_url, class: 'button stopper'
> > +                  #container.hide()
> > +
> > +=======
>
> Yea, it works. This is just when there was a merge conflict, i just git
> mergetool and chose that I want the remote's file, but idk why they saved a
> original file under that name. I did git rm that file and then pushed again
> but it says everything up to date. Any idea what should i do?
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/snowstorm/web/pull/29/files#r3682997>
> .
>



-- 
Cheers,
Jiunn Haur (Jim)

--*Carpe Diem!*