a14ac79a_ns_With_Regards_to_File_Status__Rollback_Command
[File status] merged with conflicts [Result] all local changes will be dropped, changes from the repository will be accepted, and the file will be assigned the up to date status [Rollback Command] 
Rollback Local Changes
R o l l b a c k L o c a l C h a n g e s
R o l l b a c k D e l e t i o n
R o l l b a c k C r e a t i o n
PhpStorm 9.0.0 Help :: Rollback Actions With Regards to File Status