I will look at it when I have time. Meanwhile
http://git-scm.com/documentation
On Apr 5, 2013 9:51 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()
> > +
> > +=======
>
> Wans-MacBook-Pro:web wanxint$ git pull origin cancan
> From https://github.com/snowstorm/web
>
>    - branch cancan -> FETCH_HEAD Already up-to-date. Wans-MacBook-Pro:web
>    wanxint$ git rm app/views/polls/show.html.haml.orig fatal: pathspec
>    'app/views/polls/show.html.haml.orig' did not match any files
>    Wans-MacBook-Pro:web wanxint$
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/snowstorm/web/pull/29/files#r3683074>
> .
>