February 2012
1 post
2 tags
December 2011
2 posts
October 2011
1 post
August 2011
5 posts
9 tags
2 tags
1 tag
June 2011
1 post
How to properly perform merges from SVN branches...
It took me a million years to figure out how to do this. Hope this helps someone else:
$ git checkout my_branch
$ git svn rebase
$ git merge --squash origin/trunk
[ ... Fix merge conflicts ... ]
$ git commit -m 'Merge from trunk'
April 2011
6 posts
Watchseawitchery:
I started out clicking strategically… and by the end was just wildly clicking and dancing in my chair.
biancavirina:
CLICK THE SQUARES.
THE WHOLE WORLD NEEDS TO KNOW ABOUT THIS.
THIS THIS THIS THIS!
FizzBuzz in Haskell
Just a little programming exercise for the sake of fun. For those who are wondering what the point is: FizzBuzz
main = mapM_ (putStrLn . str) [1..100]
where str x = case (x `mod` 3 == 0, x `mod` 5 == 0) of
(True, True) -> "FizzBuzz"
(True, _) -> "Fizz"
(_, True) -> "Buzz"
_ -> show x
March 2011
5 posts
February 2011
5 posts
Dressing the Man: 2 Items Per Month →
tomandandrew:
A: Every now and then, you need to give yourself a little fiscal gut-check. I do this every couple of months by logging into Mint, organizing all of my purchases, then eating only rice and beans for a week as punishment for spending so much money. Looking at the last year, I was pretty surprised…
A great article on getting an adult wardrobe at 2 items per month. My only...
Tigers love playing with the iPad →
wordsofgeek:
There is a universal agreement on the fact that iPad is for the young and old. But what about the wild animals? Does iPad has what it takes to appeal to the friendly and non-violent side of the big cats, Tiger? See the video after the break and answer the question. Continue Reading..
January 2011
7 posts
Stephen Colbert on American, Republican-style... →
December 2010
12 posts
Playing Matchmaker
Mom: I think that (girl) would be a good match for (boy), so I invited (girl) to dinner!
Me: What makes you think they'd be a good match!?
Mom: Oh, I don't know, (boy) is really weird, and (girl) is weird too, so they could just be weird together that way!
Do Not Encourage
Mom: Wazzuppppp!
Me: Don’t do that.
Powerful Ads: Lottery of Life →
Maybe I should quit whining.
November 2010
30 posts
Recursion. →
4th Amendment Wear →
This is a pretty clever bit of protest to the current TSA screening procedures. I hadn’t really considered that the 4th amendment really applies, but I guess that it might.
