3 Dec
2007
3 Dec
'07
12:40 p.m.
On 3 Dec 2007, at 13:28, Alexey Blinov wrote:
$ cd /Library/Application\ Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/ $ svn stat ? blogging.rb.mine ? blogging.rb.r8583 ? blogging.rb.r8548 C blogging.rb
is it couse the prob?
Yes, so easiest is:
cp blogging.rb.r8583 blogging.rb svn resolved blogging.rb
As the current version does show returned slug, so probably no need to preserve yours.
Alternatively edit blogging.rb and manually resolve the conflict(s) then run svn resolved on the file.