Tortoise SVN: Resolve conflict using ‘theirs’. What does it mean?

Resolve conflict using ‘theirs’ means that when you try to check in two files that have conflicting edits, SVN will discard your changes and use the other persons change instead.

Resolve conflict using ‘mine’ means that you will discard their changes, and use your version of the file instead.

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)