This is directly related to https://www.drupal.org/project/workspace/issues/3085932 in the Workspace module.

If there are conflicts when trying to deploy from one workspace to another, the user is prompted to choose if they would like to abort or to continue with the deployment and overwrite the target workspace.

If the user chooses to overwrite the target workspace, the deployment is completed but does not overwrite.

CommentFileSizeAuthor
#2 overwrite-upstream-workspace-with-deployment-conflicts-3085937-1.patch1.86 KBsasel
Screen Shot 2019-10-04 at 1.45.50 PM.png40.68 KBsasel

Comments

sasel created an issue. See original summary.

sasel’s picture

sasel commented
StatusFileSize
new overwrite-upstream-workspace-with-deployment-conflicts-3085937-1.patch1.86 KB

The attached patch would allow the user to overwrite upstream when deploying with conflicts.

sasel’s picture

sasel commented
Status: Active » Needs review