Řešení tree file conflictu v SVN

Jeden příklad, mluvící sám za sebe 🙂
svn: Commit failed (details follow): svn: Item '/branches/kwick/inc/img/icons' is out of date [arteal@shavo kwick]$ svn update inc/img/icons/ C inc/img/icons At revision 54. Summary of conflicts: Tree conflicts: 1 [arteal@shavo kwick]$ svn resolve --accept working inc/img/icons/ Resolved conflicted state of 'inc/img/icons'

Leave a Reply

Your email address will not be published. Required fields are marked *