Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 06:25:45 +01:00
Code Issues Packages Projects Releases Activity

refactor

Browse Source
This commit is contained in:
Maren Süwer
2018-12-10 15:47:46 +01:00
parent e636d409ed
commit 5902dfab6a
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,6 @@ class GitMergeInformation extends React.Component<Props> {
return ( return (
<div> <div>
<h4>{t("scm-git-plugin.information.merge.heading")}</h4> <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")} {t("scm-git-plugin.information.merge.checkout")}
<pre> <pre>
<code>git checkout {target}</code> <code>git checkout {target}</code>

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

@@ -5,14 +5,12 @@
"create" : "Create a new repository", "create" : "Create a new repository",
"replace" : "Push an existing repository", "replace" : "Push an existing repository",
"merge": { "merge": {
"heading": "How to merge pull request", "heading": "Pull Request cannot be merged automatically - please follow these steps:",
"subheading": "Pull Request cannot be merged automatically - please follow these steps:", "clean": "1. Make sure your workspace is clean and checkout target branch",
"clean": "1. Make sure your workspace is clean", "update": "2. Update workspace",
"checkout": "2. Checkout target branch", "merge": "3. Merge source branch",
"update": "3. Update workspace", "resolve": "4. Resolve merge conflicts and add corrected files to index",
"merge": "4. Merge source branch", "commit": "5. Commit"
"resolve": "5. Resolve merge conflicts and add corrected files to index",
"commit": "6. Commit"
} }
}, },
"config": { "config": {