Looks like you have a conflict. I suggest you repeat the git checkout operation on any files with conflicts, then try again.
cheers, Thomas On Thursday, January 17, 2013 at 4:37 PM, Federico Don wrote: > Thanks for your answer but now i have other issue.... > > when execute: > > # rake assets:clear > (in /home/git/gitorious) > Please install RDoc 2.4.2+ to generate documentation. > rake aborted! > /home/git/gitorious/lib/tasks/../gitorious.rb:19: syntax error, unexpected > tLSHFT, expecting kEND > <<<<<<< HEAD > ^ > /home/git/gitorious/lib/tasks/../gitorious.rb:21: syntax error, unexpected > tEQQ, expecting kEND > ======= > ^ > /home/git/gitorious/lib/tasks/../gitorious.rb:23: syntax error, unexpected > tRSHFT, expecting kEND > >>>>>>> v2.4.1 > ^ > /home/git/gitorious/lib/tasks/../gitorious.rb:23: no .<digit> floating > literal anymore; put 0 before dot > >>>>>>> v2.4.1 > ^ > /home/git/gitorious/Rakefile:10:in `require' > (See full trace by running task with --trace) > > I have Rdoc 3.12 > > # gem list -d rdoc > > *** LOCAL GEMS *** > > rdoc (3.12) > Authors: Eric Hodel, Dave Thomas, Phil Hagelberg, Tony Strauss > Rubyforge: http://rubyforge.org/projects/rdoc > Homepage: http://docs.seattlerb.org/rdoc > Installed at: /opt/ruby-enterprise-1.8.7-2011.03/lib/ruby/gems/1.8 > > RDoc produces HTML and command-line documentation for Ruby projects > > Could you please help me? > > Thanks and regards, > > > > > 2013/1/17 Thomas Kjeldahl Nilsson <tho...@gitorious.org > (mailto:tho...@gitorious.org)> > > Hi Frederico, > > > > seems you have touched that ldap lib file, but unless you have something > > you need in there you can simply reset in like this: > > > > git checkout lib/gitorious/authentication/ldap_authentication.rb > > > > and proceed with the merge. :) > > > > cheers, > > Thomas > > > > > > On Thursday, January 17, 2013 at 12:16 AM, Federico Don wrote: > > > > > lib/gitorious/authentication/ldap_authentication.rb > > > > > > -- > > To post to this group, send email to gitorious@googlegroups.com > > (mailto:gitorious@googlegroups.com) > > To unsubscribe from this group, send email to > > gitorious+unsubscr...@googlegroups.com > > (mailto:gitorious%2bunsubscr...@googlegroups.com) > > -- > To post to this group, send email to gitorious@googlegroups.com > (mailto:gitorious@googlegroups.com) > To unsubscribe from this group, send email to > gitorious+unsubscr...@googlegroups.com > (mailto:gitorious+unsubscr...@googlegroups.com) -- To post to this group, send email to gitorious@googlegroups.com To unsubscribe from this group, send email to gitorious+unsubscr...@googlegroups.com
