Conflicted when trying to commit to SVN
I was trying to commit some of my new test sets to SVN, but I got some error saying the items are in conflicted status.
I go to one of the conflicted script, and saw below.
The blue content are not mine, was it because I was adding stuff to this script while another team member adding code to the script as well? In this case, what should I do? How can I commit my scripts in without mess up other people's work? Did I loss all of my work?
Thanks in advance!