If you’re trying to pop a stash and Git won’t merge for you because you have changes in your index to the same file(s) (Git needs to use the index to do a merge at all), i.e.:
❯ gsp
error: Your local changes to the following files would be overwritten by merge:
index.html
Please, commit your changes or stash them before you can merge.
Aborting
To allow us to automatically create a good quality changelog from our git history we recommend the following formats for commit messages.
The aim is to capture a reference to any ticket, card, or story that this commit contributes towards.
Because we are now using the Pivotal Tracker Webhook on some projects we suggest wrapping your commit message prefix with square brackets []
http://pivotallabs.com/level-up-your-development-workflow-with-github-pivotal-tracker/
| // https://gist.github.com/1096291 | |
| ;(function ($) { | |
| $.fn.truncateLines = function(options) { | |
| options = $.extend($.fn.truncateLines.defaults, options); | |
| return this.each(function(index, container) { | |
| container = $(container); | |
| var containerLineHeight = Math.ceil(parseFloat(container.css('line-height'))); |
| @include keyframes(appear-and-roundify) { | |
| 0% { opacity: 0; @include border-radius(2px); } | |
| 100% { opacity: 1; @include border-radius(10px); } | |
| } |
| \documentclass[11pt,a4paper]{article} | |
| % for images. | |
| \usepackage{graphicx} | |
| \usepackage{setspace} | |
| % for code blocks | |
| \usepackage{listings} | |
| % referencing using surname first | |
| \usepackage{natbib} |
| /** | |
| * adds a pause and unpause method to Mousetrap | |
| * this allows you to enable or disable keyboard shortcuts | |
| * without having to reset Mousetrap and rebind everything | |
| */ | |
| Mousetrap = (function(Mousetrap) { | |
| var self = Mousetrap, | |
| _original_stop_callback = self.stopCallback, | |
| enabled = true; |
| #! /bin/bash | |
| x=`identify -format "%w" $1` | |
| y=`identify -format "%h" $1` | |
| data=`openssl base64 < $1 | tr -d '\n'` | |
| type=`file --mime-type -b $1` | |
| echo "display:block; | |
| font:0/0 a; | |
| color:transparent; |
| #!/bin/sh | |
| # This shell script is used to bootstrap the app and update external libraries | |
| # | |
| # ====== IMPORTANT ====== | |
| # | |
| # it may break application if 3rd party libs aren't backwards compatible | |
| # or if libs were edited locally, use with care !!! |
| @mixin retina { | |
| /* Target any and all high-density screens on any browser currently known (October 2012) */ | |
| @media (min--moz-device-pixel-ratio: 1.5), | |
| (-o-min-device-pixel-ratio: 3/2), | |
| (-webkit-min-device-pixel-ratio: 1.5), | |
| (min-resolution: 1.5dppx) { | |
| @content; | |
| } | |
| } |
| (ns whatlang.core | |
| (:require [clojure.java.io :as io] | |
| [clojure.string :as str] | |
| [clojure.set :as sets] | |
| )) | |
| (defn load-data | |
| "Read the country data file from the resource. The data has been | |
| mangled in to lines like so: |
