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

fix wrong i18n key and added step 6 the push

Browse Source
This commit is contained in:
Sebastian Sdorra
2018-12-11 09:53:40 +01:00
parent f834dd5297
commit 858d2816da
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,12 @@ class GitMergeInformation extends React.Component<Props> {
git commit -m "Merge {source} into {target}" git commit -m "Merge {source} into {target}"
</code> </code>
</pre> </pre>
{t("scm-git-plugin.information.merge.push")}
<pre>
<code>
git push
</code>
</pre>
</div> </div>
); );
} }

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

@@ -6,11 +6,12 @@
"replace" : "Push an existing repository", "replace" : "Push an existing repository",
"merge": { "merge": {
"heading": "How to merge source branch into target branch", "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", "update": "2. Update workspace",
"merge": "3. Merge source branch", "merge": "3. Merge source branch",
"resolve": "4. Resolve merge conflicts and add corrected files to index", "resolve": "4. Resolve merge conflicts and add corrected files to index",
"commit": "5. Commit" "commit": "5. Commit",
"push": "6. Push your merge"
} }
}, },
"config": { "config": {