Home ›
A day after learning about Git, SVN gives me troubleA day after learning about Git, SVN gives me trouble
Submitted by Benjamin Melançon on June 13, 2007 - 4:34pm
Longest commit message to date, and I hope ever:
added Video Features template. Before doing this I had simply added a note-- just a note, two lines-- above the css replacing function about how it overrides any stylesheet if you put one with the same name in your theme folder. And SVN choked. Put a big C next to it and made four versions of the file - .mine, .r589, and .r598 when I did an SVN update. There was no actual conflict in our changes. Dan had added his template override for Featured Affiliate view at the bottom. This was really pathetic. Anyway, I deleted template.php, svn update restored it, and then I made my changes on an up-to-date copy. But we need Git."
Comments
Post new comment