-
git pull --rebase
instead ofgit pull
-
git rebase -i @{u}
beforegit push
-
(on “feature”)
git merge master
to make feature compatible with latest master -
(on “master”)
git merge --no-ff feature
to ship a feature
/** | |
* The first commented line is your dabblet’s title | |
*/ | |
div { | |
padding: 20px; | |
border: 1px solid #999; | |
width: 40px; | |
height: 40px; | |
box-shadow: 0 5px 5px -5px #000000; |
.children{ | |
background: #ffdb4c; | |
height: 300px; | |
position: relative; | |
top: 50%; | |
transform: translateY(-50%); | |
} |
This is a post by Joel Spolsky. The original post is linked at the bottom.
This is such a common question here and elsewhere that I will attempt to write the world's most canonical answer to this question. Hopefully in the future when someone on answers.onstartups asks how to split up the ownership of their new company, you can simply point to this answer.
The most important principle: Fairness, and the perception of fairness, is much more valuable than owning a large stake. Almost everything that can go wrong in a startup will go wrong, and one of the biggest things that can go wrong is huge, angry, shouting matches between the founders as to who worked harder, who owns more, whose idea was it anyway, etc. That is why I would always rather split a new company 50-50 with a friend than insist on owning 60% because "it was my idea," or because "I was more experienced" or anything else. Why? Because if I split the company 60-40, the company is going to fail when we argue ourselves to death. And if you ju
/*global $, Backbone, window, console, WebSocket, _ */ | |
$(function () { | |
"use strict"; | |
// for better performance - to avoid searching in DOM | |
var $content = $('#content') | |
, $input = $('#input') | |
, $status = $('#status') | |
// my color assigned by the server |
var myapp = angular.module('myapp', []); | |
myapp.factory('awesomeService', function($http) { | |
return { | |
GetUser: function() { | |
return $http.get("some url here").then(function(response) { | |
//Process Stuff Here | |
return response; | |
}); | |
}, | |
} |
- https://www.atatus.com - Javascript Contextual error tracking
- http://www.errorify.com/ - source maps
- http://errorception.com/ - translate error messages to English
- http://www.exceptionhub.com/
- http://jserrlog.appspot.com/
- http://www.muscula.com/ - source maps, translate error messages to English
- https://www.airbrake.io/ - tracekit, source maps
java.lang.NoClassDefFoundError: javax.naming.ldap.LdapName is a restricted class. Please see the Google App Engine developer's guide for more details. | |
at com.google.appengine.tools.development.agent.runtime.Runtime.reject(Runtime.java:51) | |
at org.apache.http.conn.ssl.AbstractVerifier.extractCNs(AbstractVerifier.java:277) | |
at org.apache.http.conn.ssl.AbstractVerifier.getCNs(AbstractVerifier.java:265) | |
at org.apache.http.conn.ssl.AbstractVerifier.verify(AbstractVerifier.java:157) | |
at org.apache.http.conn.ssl.AbstractVerifier.verify(AbstractVerifier.java:140) | |
at org.apache.http.conn.ssl.SSLSocketFactory.verifyHostname(SSLSocketFactory.java:561) | |
at org.apache.http.conn.ssl.SSLSocketFactory.connectSocket(SSLSocketFactory.java:536) | |
at org.apache.http.conn.ssl.SSLSocketFactory.connectSocket(SSLSocketFactory.java:403) | |
at org.apache.http.impl.conn.DefaultClientConnectionOperator.openConnection(DefaultClientConnectionOperator.java:177) |
import java.util.LinkedHashMap; | |
import java.util.logging.Level; | |
import java.util.logging.Logger; | |
import javax.ws.rs.core.MediaType; | |
import org.json.JSONObject; | |
import com.plivo.helper.api.client.RestAPI; | |
import com.plivo.helper.api.response.message.MessageResponse; |