Category Archives: git

How to fix Subversion merge

Having done quite a bit of branching in centralized and distributed source control systems, I’m intimately aware of the additional (and I would say, unnecessary) pain centralized source control systems like Subversion and TFS bring to more powerful branching strategies … Continue reading 

Also posted in Mercurial | 12 Comments

Hipster Git Commands: Git Stache

We’re all familiar with ‘git stash’ – the ability to store changes in a special working folder without committing them to the repository. Well… thanks to a tweet by Jimmy Bogard, we now have the hipster version: git stache (image … Continue reading 

Also posted in Architecture, Distributed Systems | 9 Comments

CodeStock 2011 Wrap-up

This past weekend, I had the pleasure of attending and speaking at the CodeStock 2011 conference. I haven’t been to a whole lot of developer-run conferences besides our own local code camps, but this one absolutely blew the others away. … Continue reading 

Also posted in Domain-Driven Design, OO | 3 Comments

Git Branches: A Pointer, With History And Metadata

A few months ago, I had an “AHA!” moment working with git. I was doing one of my usual fixes for a mistake I had made and I had the realization that a named branch in git can be thought … Continue reading 

Also posted in AutoMapper | 6 Comments

Solving Some SSH Issues For Deploying Rails Apps

So you think “The Rails Life” is all unicorns, rainbows and glitter? Yeah. Guess again. Right now it feels more like a glitter cannon shredding a unicorn into a rainbow colored bloody pulp… Joey and I are deploying our rails … Continue reading 

Also posted in BDD, Behavior-Driven Development | 4 Comments

posh-git Release v0.3

On a whim, I’ve decided to tag a v0.3 release of posh-git (which has been stable for a few months now). In this release… Installer Previously the setup process for posh-git was undefined. Daniel Hoelbling was kind enough to put … Continue reading 

Also posted in Agile | Leave a comment

Windows Git Tip: Hide ^M (Carriage Return) in Diff

A common point of confusion when getting started with Git on Windows is line endings, with Windows still using CR+LF while every other modern OS uses LF only. Git provides three ways to deal with this discrepancy, as described in … Continue reading 

Also posted in Agile, Behave#, Testing | Leave a comment

Using AppHarbor for Continuous Integration

I thought it would be interesting to use AppHarbor as a quick way to get some code with tests under a continuous integration environment. Along with this, if I could also use the AppHarbor deployed web site to serve that … Continue reading 

Also posted in Team Build | Leave a comment

Git: D’OH! I didn’t want to delete that branch!

In the process of writing up the previous blog post, I accidentally deleted my “bioreference” branch, with no current commit pointing to it. To illustrate, my repository went from this: to this: All of my commits appear to be gone… … Continue reading 

Also posted in C#, LINQ | 2 Comments

Git: Oops! I didn’t mean to commit on that remote tracking branch!

I’ve talked about 2 very similar situations in the past. This is just a small variation, but I still find it useful enough to make another small post. I’m using the same checkout and reset commands that I’ve shown before. … Continue reading 

Also posted in C#, Domain-Driven Design | 50 Comments