Hello Ken, I figured it out, thanks. haha, ok my process below.
That was exactly the issue...the file /home/git/gitorious/lib/tasks/../gitorious.rb for some reason didn't merge properly. I deleted the offending lines > <<<<<<< HEAD > VERSION = "2.3.2" > ======= as I was heading towards version 2.4.1, and then the command bundle exec rake assets:clear worked. Interestingly enough, I had the same issue happen again during my upgrade from 2.4.1 to 2.4.5, but at least I had some idea of what I was looking for the second time ;) Thanks for replying! On Saturday, January 19, 2013 10:29:38 AM UTC-8, Ken Dreyer wrote: > > On Fri, Jan 18, 2013 at 4:38 PM, <[email protected] <javascript:>> > wrote: > > /home/git/gitorious/lib/tasks/../gitorious.rb > > module Gitorious > > <<<<<<< HEAD > > VERSION = "2.3.2" > > ======= > > VERSION = "2.4.1" > >>>>>>>> v2.4.1 > > end > > > > The <<< and >>> characters makes me wonder if you're installation is > stuck in the middle of a merge or rebase. Can you paste the output of > "git status" ? > > - Ken > -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected]
