-
At the first conflict, unstage the schema diff from your new branch:
git reset HEAD db/schema.rb
-
Discard the schema diff from your new branch:
git checkout db/schema.rb
-
Rebuild the schema:
rake db:migrate
#!/bin/bash | |
# suspend/sleep linux system on xscreensaver activation | |
# | |
# run the bash script in your .xsession, | |
# or something like .config/lxsession/LXDE/autostart for lxde | |
timeout=60 # After xscreensaver activated, wait timeout to suspend | |
read_timeout=5 # timeout for read from `xscreensaver-command -watch` | |
SUSPEND_BIN=/usr/sbin/pm-suspend |
# frozen_string_literal: true | |
require 'mechanize' | |
require 'eps' | |
require 'daru' | |
def format_salary(string) | |
string.strip.delete(',').delete('$').to_i | |
end |
<%= f.input :email, | |
wrapper: :semantic_icon_input, | |
label: false, | |
required: true, | |
placeholder: t('users.form.placeholder.email'), | |
left_icon: 'user' %> |
<!DOCTYPE html> | |
<html> | |
<head> | |
<title>triangles</title> | |
</head> | |
<body> | |
<script src="https://cdnjs.cloudflare.com/ajax/libs/trianglify/0.4.0/trianglify.min.js"></script> | |
<script> | |
var colors = shuffle(['#599054','#94B569', '#C4D2A5', '#F6EECD']); | |
var des_colores = shuffle(['#94B569', '#C4D2A5', '#F2D383', '#fff']); |
I hereby claim:
- I am timup on github.
- I am timupchurch (https://keybase.io/timupchurch) on keybase.
- I have a public key whose fingerprint is AE03 AEED 9ABC A9C0 87ED 6E75 EEBA 666E 72FB 41CF
To claim this, I am signing this object:
To generate this project, do the following on the command line:
rails generate scaffold student name:string
rails generate scaffold course name:string
rails generate model enrollment student_id:integer course_id:integer
require 'webrick' | |
puts "Starting server" | |
root = File.expand_path '~/PATH/MORE_PATH' | |
server = WEBrick::HTTPServer.new Port: 8000, DocumentRoot: root | |
trap 'INT' do server.shutdown end | |
server.start |
I was at Amazon for about six and a half years, and now I've been at Google for that long. One thing that struck me immediately about the two companies -- an impression that has been reinforced almost daily -- is that Amazon does everything wrong, and Google does everything right. Sure, it's a sweeping generalization, but a surprisingly accurate one. It's pretty crazy. There are probably a hundred or even two hundred different ways you can compare the two companies, and Google is superior in all but three of them, if I recall correctly. I actually did a spreadsheet at one point but Legal wouldn't let me show it to anyone, even though recruiting loved it.
I mean, just to give you a very brief taste: Amazon's recruiting process is fundamentally flawed by having teams hire for themselves, so their hiring bar is incredibly inconsistent across teams, despite various efforts they've made to level it out. And their operations are a mess; they don't really have SREs and they make en