Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-21 07:49:55 +01:00
Code Issues Packages Projects Releases Activity

Manual merge instructions have been fixed

Browse Source
This commit is contained in:
Tarik Gürsoy
2024-07-04 10:28:53 +02:00
parent 87714f5e1b
commit bb4589e87f
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-plugins/scm-git-plugin/src/main/js/GitMergeInformation.tsx
View File

@@ -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")}

3
scm-plugins/scm-git-plugin/src/main/resources/locales/de/plugins.json
View File

@@ -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"
}

3
scm-plugins/scm-git-plugin/src/main/resources/locales/en/plugins.json
View File

@@ -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"
}