void function ( ) { notifyWarning ( "srini_string" , "srini_string" + myParams . myErrorNotificationAdditionalDescription ) ; }
shows notification that some conflicts were still not resolved - after user invoked the conflict resolver by pressing the link on the notification . concode_field_sep String myErrorNotificationTitle concode_elem_sep String myMergeDescription concode_elem_sep boolean reverse concode_elem_sep MergeDialogCustomizer myMergeDialogCustomizer concode_elem_sep GitRepositoryManager myRepositoryManager concode_elem_sep Params myParams concode_elem_sep Logger LOG concode_elem_sep String myErrorNotificationAdditionalDescription concode_elem_sep GitPlatformFacade myPlatformFacade concode_elem_sep Project myProject concode_elem_sep AbstractVcsHelper myVcsHelper concode_elem_sep Collection<VirtualFile> myRoots concode_elem_sep Git myGit concode_field_sep boolean proceedIfNothingToMerge concode_elem_sep void notifyException concode_elem_sep void hyperlinkUpdate concode_elem_sep Params setErrorNotificationTitle concode_elem_sep Params setReverse concode_elem_sep String getMultipleFileMergeDescription concode_elem_sep boolean mergeNoProceed concode_elem_sep void notifyUnresolvedRemain concode_elem_sep Params setErrorNotificationAdditionalDescription concode_elem_sep Params setMergeDescription concode_elem_sep Collection<VirtualFile> getUnmergedFiles concode_elem_sep Collection<VirtualFile> getUnmergedFiles concode_elem_sep boolean proceedAfterAllMerged concode_elem_sep Params setMergeDialogCustomizer concode_elem_sep boolean merge concode_elem_sep boolean merge concode_elem_sep void notifyWarning concode_elem_sep NotificationListener getResolveLinkListener concode_elem_sep void showMergeDialog concode_elem_sep List<VirtualFile> unmergedFiles