1. svn resolve
2. svn cleanup
3. svn update
순으로 진행하면 해결된다.
출처
https://stackoverflow.com/questions/2406469/svn-remains-in-conflict
SVN remains in conflict?
How do I get this directory out of conflict? I don't care if it's resolved using "theirs" or "mine" or whatever... PS C:\Users\Mark\Desktop\myproject> svn ci -m "gr" svn: Commit failed (details
stackoverflow.com
'개인 공부 > 툴' 카테고리의 다른 글
| [mantis] 버그 추적 프로그램 (0) | 2022.10.06 |
|---|