Situation: To "force" a particular workflow, our P4 server is set up so that you can only edit/commit files on directories starting with "feat_" or "bug_". That means to change the main/HEAD/branch or however you call it, you have to integrate to a branch that is named correctly, edit/commit your changes on that branch and then integrate/resolve/commit back to the main branch which works. After integrating a branch, back to main with P4V or P4Win I wanted to resolve/merge the files within IDEA because I like the merging dialog and was used to it. After choosing "Perforce -> Resolve All" I was asked how I want to clear the read-only status, via filesystem or via VCS. Both options did not work. If I cleared the status using VCS, on commit I got the message that I'm not allowed to commit because of the trigger that checks for "feat_" and "bug_". If I cleared the status using filesystem, I got an error message that the file was tampered with after resolving. From P4V and P4Win it works fine. And if I resolve the files in P4V or P4Win, the files read-only status is not changed, but remains on read-only. The Perforce Plugin should do the resolving the same way as it is done with the "official P4 clients". Manual Workaround:

• There is no workaround, don't use IDEAs resolving function for Perforce but use P4V, P4Win or P4.