The Unemployed Programmer
Who knew unenjoyment could be so fun!?!?!
Saturday, December 17, 2011
Aborting commit: '...' remains in conflict
svn remove --force filenameOrDir
svn resolve --accept=working filenameOrDir
svn commit
No comments:
Post a Comment
Newer Post
Older Post
Home
Subscribe to:
Post Comments (Atom)
Cool Links
HTML5 Canvas
Typefaces done with CSS
Blog Archive
►
2013
(8)
►
August
(1)
►
July
(1)
►
April
(1)
►
February
(1)
►
January
(4)
►
2012
(12)
►
December
(2)
►
June
(1)
►
May
(2)
►
April
(2)
►
January
(5)
▼
2011
(11)
▼
December
(3)
Converting Mac sound files using command line
Aborting commit: '...' remains in conflict
Xcode 4.2 and iOS 4.2.1
►
November
(3)
►
February
(5)
►
2010
(13)
►
November
(1)
►
October
(4)
►
April
(1)
►
March
(7)
Followers
No comments:
Post a Comment