Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-08-31 04:17:14 +02:00
Code Issues Packages Projects Releases Activity

correct error throwing in apiclient and add extension point

Browse Source
This commit is contained in:
Maren Süwer
2018-12-10 15:36:52 +01:00
parent 3d36d07e1d
commit e636d409ed
4 changed files with 72 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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