Multiple choice technology

Which Among the following are the options to resolve a conflicted file in SVN ?

  1. Edit Conflicts and Resolved

  2. Delete the file from the local history, and update it, before commiting the local changes

  3. Commit the local user's changes first and update the conflicted file

  4. All the above
Reveal answer Fill a bubble to check yourself
A,B Correct answer
Explanation

Both A and B are valid conflict resolution strategies in SVN. A: Use the built-in conflict editor to manually merge changes, then mark as resolved. B: Delete the conflicted file, update to get the repository version, then reapply local changes. C is incorrect - committing during a conflict state will fail and risks data loss.

Keep practicing — related questions