From 858d2816da5d97d4f3527614c64844a2036143db Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 11 Dec 2018 09:53:40 +0100
Subject: [PATCH] fix wrong i18n key and added step 6 the push

---
 .../scm-git-plugin/src/main/js/GitMergeInformation.js       | 6 ++++++
 .../src/main/resources/locales/en/plugins.json              | 5 +++--
 2 files changed, 9 insertions(+), 2 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 8f5fba5db6..0e6a9d6af6 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.js
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.js
@@ -45,6 +45,12 @@ class GitMergeInformation extends React.Component<Props> {
             git commit -m "Merge {source} into {target}"
           </code>
         </pre>
+        {t("scm-git-plugin.information.merge.push")}
+        <pre>
+          <code>
+            git push
+          </code>
+        </pre>
       </div>
     );
   }
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 563cfe47e2..c02cd9e101 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
@@ -6,11 +6,12 @@
       "replace" : "Push an existing repository",
       "merge": {
         "heading": "How to merge source branch into target branch",
-        "clean": "1. Make sure your workspace is clean and checkout target branch",
+        "checkout": "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"
+        "commit": "5. Commit",
+        "push": "6. Push your merge"
       }
     },
     "config": {