You are attempting to push when you experience a conflict:
[ksedgwic@lap2 bonsai-wiki]$ git push
To ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to ’ssh://ikiwiki@git.bonsai.com/~/public_git/bonsai-wiki.git’
First, see if the conflict can be automatically resolved:
[ksedgwic@lap2 bonsai-wiki]$ git pull
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: [...]
http://www.tutorialspoint.com/ruby-on-rails/index.htm
http://216.178.38.116/index.cfm?fuseaction=music.artistalbums&artistid=5890852&albumid=14916961
Filed Under
(Music) by
admin
This is just for future reference ;=)
<html>
<head>
<title>CSS based drop-down menu</title>
<style type=”text/css”>
ul {
font-family: Arial, Verdana;
font-size: 14px;
margin: 0;
padding: 0;
list-style: none;
}
ul li {
display: block;
position: relative;
float: left;
}
li ul { display: none; }
ul li a {
display: block;
text-decoration: none;
color: #ffffff;
border-top: 1px solid #ffffff;
padding: 5px 15px 5px 15px;
background: #2C5463;
margin-left: 1px;
white-space: nowrap;
}
ul li a:hover { background: #617F8A; }
li:hover ul {
display: block;
position: absolute;
}
li:hover li [...]
Finally, I have found the way to setup my rails application using Phusion Passenger at Site5 hosting.
It works for me! hope this will a stable one.
Visit this link: http://wiki.site5.com/Scripting_and_Development_Guide#Ruby_on_Rails
Yey!
Wondering how to type the letter “ñ” in MAC? Well here’s the link
enjoy! -> http://watchingapple.com/2007/08/tip-how-to-type-a-tilde/
Reference: http://www.informit.com/articles/article.aspx?p=1087656
If we’re speaking about route recognition, the bound parameters—key/value pairs in the hash of options at the end of the route’s argument list—determine what’s going to happen if and when this route matches an incoming URL. Let’s say someone requests this URL from their web browser:
http://localhost:3000/myrecipes/apples
This URL will match the ingredient route. The result [...]
The Domain Name System (DNS) is a hierarchical naming system for computers, services, or any resource participating in the Internet. It associates various information with domain names assigned to such participants. Most importantly, it translates domain names meaningful to humans into the numerical (binary) identifiers associated with networking equipment for the purpose of locating and [...]
Startup
Keystroke
Description
Press X during startup
Force Mac OS X startup
Press Option-Command-Shift-Delete
during startup
Bypass primary startup volume and seek a different startup volume (such as a CD or external disk)
Press C during startup
Start up from a CD that has a system folder
Press N during startup
Attempt to start up from a compatible network server (NetBoot)
Press T during startup
Start up in [...]
Version: 0.03, July 3, 2006
Author: Brett G. Durrett (first name at last name dot net)
Source: http://durrett.net/mogilefs_setup.html
Overview
This document explains how to setup and configure a basic MogileFS installation. It is intended for the novice systems administrator and should enable anybody with the skills to install a basic Linux distro to get MogileFS up and running on [...]
