diff --git a/gradle/changelog/manual_pullrequest_help.yml b/gradle/changelog/manual_pullrequest_help.yml
new file mode 100644
index 0000000000..ff576ff109
--- /dev/null
+++ b/gradle/changelog/manual_pullrequest_help.yml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Description to be more helpful
diff --git a/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.tsx b/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.tsx
index b0cd9c93fe..cdcf4cb777 100644
--- a/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.tsx
+++ b/scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.tsx
@@ -39,8 +39,9 @@ class GitMergeInformation extends React.Component<Props> {
 
     const gitCheckoutCommand = `git checkout ${target}`;
     const gitUpdateCommand = "git pull";
-    const gitMergeCommand = `git merge ${source}`;
-    const gitResolveCommand = "git add <conflict file>";
+    const gitMergeCommand = `git merge origin/${source}`;
+    const gitResolveCommandA = "git add <conflict file>";
+    const gitResolveCommandB = "git add --all";
     const gitCommitCommand = `git commit -m "Merge ${source} into ${target}"`;
     const gitPushCommand = "git push";
 
@@ -53,8 +54,10 @@ class GitMergeInformation extends React.Component<Props> {
         <PreformattedCodeBlock>{gitUpdateCommand}</PreformattedCodeBlock>
         {t("scm-git-plugin.information.merge.merge")}
         <PreformattedCodeBlock>{gitMergeCommand}</PreformattedCodeBlock>
-        {t("scm-git-plugin.information.merge.resolve")}
-        <PreformattedCodeBlock>{gitResolveCommand}</PreformattedCodeBlock>
+        {t("scm-git-plugin.information.merge.resolve_a")}
+        <PreformattedCodeBlock>{gitResolveCommandA}</PreformattedCodeBlock>
+        {t("scm-git-plugin.information.merge.resolve_b")}
+        <PreformattedCodeBlock>{gitResolveCommandB}</PreformattedCodeBlock>
         {t("scm-git-plugin.information.merge.commit")}
         <PreformattedCodeBlock>{gitCommitCommand}</PreformattedCodeBlock>
         {t("scm-git-plugin.information.merge.push")}
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json b/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json
index dca595f48b..865e1f3aec 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json
+++ b/scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json
@@ -12,7 +12,8 @@
         "checkout": "1. Sicherstellen, dass der Workspace aufgeräumt ist und der Target Branch ausgecheckt wurde.",
         "update": "2. Update Workspace",
         "merge": "3. Merge Source Branch",
-        "resolve": "4. Merge Konflikte auflösen und korrigierte Dateien dem Index hinzufügen.",
+        "resolve_a": "4a. Merge Konflikte auflösen und korrigierte Dateien einzeln dem Index hinzufügen oder",
+        "resolve_b": "4b. Merge Konflikte auflösen und korrigierte Dateien auf einmal dem Index hinzufügen.",
         "commit": "5. Commit",
         "push": "6. Push des Merge"
       }
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 acddaacc5d..4133189e75 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
@@ -12,7 +12,8 @@
         "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",
+        "resolve_a": "4a. Resolve merge conflicts and add corrected files to index individually or",
+        "resolve_b": "4b. Resolve merge conflicts and add all files at once to index",
         "commit": "5. Commit",
         "push": "6. Push your merge"
       }