PyCharm
 
Get PyCharm

Mark Resolved dialog (Subversion)

Last modified: 23 February 2024

Use this dialog to have PyCharm consider conflicts in a file or directory resolved. This operation is most often required after merging text or property conflicts manually.