Conflicts happens if you have local changes. You have two choices:
1. Merge your local changes with the incoming one. It is easy with eclipse and SVN client such as Subversive.
2. Override and update. It will overwrite your local modification. Thanks, Raj BJ Freeman wrote:
showing conflicts for startofbiz.sh and .bat any idea how to resolve this?
