diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 58adc7d77b1..72932eba1a1 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -259,6 +259,7 @@ public:
     QProcessEnvironment processEnvironment() const;
 
     bool isValidRevision(const QString &revision) const;
+    void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand);
 
     static QString msgNoChangedFiles();
 
@@ -324,7 +325,6 @@ private:
     void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd);
     bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments,
                                    const QString &abortCommand = QString());
-    void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand);
     bool tryLauchingGitK(const QProcessEnvironment &env,
                          const QString &workingDirectory,
                          const QString &fileName,