Add force-deploy option when conflict detected

This commit is contained in:
Nick O'Leary
2017-05-05 15:52:37 +01:00
parent 6b07f58e8e
commit 401d386812
2 changed files with 21 additions and 8 deletions

View File

@@ -133,9 +133,10 @@
"button": {
"ignore": "Ignore",
"confirm": "Confirm deploy",
"review": "Review differences",
"review": "Review changes",
"cancel": "Cancel",
"merge": "Merge changes"
"merge": "Merge",
"overwrite": "Ignore & deploy"
},
"undeployedChanges": "You have undeployed changes.\n\nLeaving this page will lose these changes.",
"improperlyConfigured": "The workspace contains some nodes that are not properly configured:",