This post originated from an RSS feed registered with Java Buzz
by Benjamin Booth.
Original Post: Resolving Files with TextMate, Subversion, and FileMerge
Feed Title: Table or Booth
Feed URL: http://benjaminbooth.typepad.com/tableorbooth/index.rdf
Feed Description: Software choices and a little on the aftermath.
If you're new or semi-new to TextMate and you're collaborating with someone on the same development project, file change collisions are inevitable. Textmate has nice support for resolving file conflicts when they show up after updating to the latest SVN...