Cannot interactivly merge file when performing a diff

This forum is now locked, since Gold Support is no longer offered.

Moderator: SourceGear

Locked
aluetjen
Posts: 40
Joined: Wed May 19, 2004 1:00 am
Location: Germany, Karlsruhe
Contact:

Cannot interactivly merge file when performing a diff

Post by aluetjen » Fri May 21, 2004 9:18 am

Hello,

when I perform a diif between a checked out file and the version in Vault I can interactivly merge changes by clicking the green marker beside the changed line. However when I click on the marker an error message "Target is readonly" appears. What is wrong?

Regards,


Alex
update4u Software AG

dan
Posts: 2448
Joined: Wed Dec 17, 2003 5:03 pm
Location: SourceGear
Contact:

Post by dan » Fri May 21, 2004 9:38 am

By default, the diff tool brings up both files in a read-only state, so you can't apply changes from one file to the other. To change this, you would need to go to Tools->Options->Diff/Merge, and take out the /ro1 and /ro2 arguments, which make the file read-only.

Locked