User login

Home ›
 A day after learning about Git, SVN gives me trouble

A 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

The content of this field is kept private and will not be shown publicly.
  • You may post code using <code>...</code> (generic) or <?php ... ?> (highlighted PHP) tags.
  • You can use Markdown syntax to format and style the text. Also see Markdown Extra for tables, footnotes, and more.
  • Web page addresses and e-mail addresses turn into links automatically.
  • Allowed HTML tags: <a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <img> <blockquote> <small> <h2> <h3> <h4> <h5> <h6> <sub> <sup> <p> <br> <strike> <table> <tr> <td> <thead> <th> <tbody> <tt> <output>
  • Lines and paragraphs break automatically.

More information about formatting options

By submitting this form, you accept the Mollom privacy policy.