When doing an "update" svn will detect overlapping changes and create the files:
filename.mine
filename.rOLDREV
filename.rNEWREV
Is it possible to set attributes on some files to detect any changes as conflicts?
I would like to always require manual merging of a specific subset of source files (ie: resource.h, myApp.rc)
Thanks in Advance,
Steve
Forcing conflicts?
1-1 of 1
Reply to this discussion
You cannot edit posts or make replies: You should be logged in before you can post.
Login to post a reply.
4089 views