From 5902dfab6af79003140e3da87b96cb8747b9f8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 10 Dec 2018 15:47:46 +0100
Subject: [PATCH] refactor

---
 .../src/main/js/GitMergeInformation.js             |  2 --
 .../src/main/resources/locales/en/plugins.json     | 14 ++++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.js b/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.js
index 12936bedaf..8f5fba5db6 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.js
@@ -17,8 +17,6 @@ class GitMergeInformation extends React.Component<Props> {
     return (
       <div>
         <h4>{t("scm-git-plugin.information.merge.heading")}</h4>
-        <h5>{t("scm-git-plugin.information.merge.subheading")}</h5>
-        {t("scm-git-plugin.information.merge.clean")}
         {t("scm-git-plugin.information.merge.checkout")}
         <pre>
           <code>git checkout {target}</code>
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
index 63ad8f2efd..a529e4b952 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
+++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
@@ -5,14 +5,12 @@
       "create" : "Create a new repository",
       "replace" : "Push an existing repository",
       "merge": {
-        "heading": "How to merge pull request",
-        "subheading": "Pull Request cannot be merged automatically - please follow these steps:",
-        "clean": "1. Make sure your workspace is clean",
-        "checkout": "2. Checkout target branch",
-        "update": "3. Update workspace",
-        "merge": "4. Merge source branch",
-        "resolve": "5. Resolve merge conflicts and add corrected files to index",
-        "commit": "6. Commit"
+        "heading": "Pull Request cannot be merged automatically - please follow these steps:",
+        "clean": "1. Make sure your workspace is clean and checkout target branch",
+        "update": "2. Update workspace",
+        "merge": "3. Merge source branch",
+        "resolve": "4. Resolve merge conflicts and add corrected files to index",
+        "commit": "5. Commit"
       }
     },
     "config": {