diff --git a/src/GitS-Core.package/GSAssetChange.class/instance/workspaceBindings.st b/src/GitS-Core.package/GSAssetChange.class/instance/workspaceBindings.st index 43cc8342c..cf486e317 100644 --- a/src/GitS-Core.package/GSAssetChange.class/instance/workspaceBindings.st +++ b/src/GitS-Core.package/GSAssetChange.class/instance/workspaceBindings.st @@ -1,6 +1,6 @@ workspace workspaceBindings - ^ Dictionary newFrom: { + ^ (Dictionary newFrom: { 'old' -> self from. 'new' -> self to. - } \ No newline at end of file + }) collect: [:each | each ifNotNil: #asset] \ No newline at end of file diff --git a/src/GitS-Core.package/GSAssetChange.class/methodProperties.json b/src/GitS-Core.package/GSAssetChange.class/methodProperties.json index ccf1542ba..2a9fad27d 100644 --- a/src/GitS-Core.package/GSAssetChange.class/methodProperties.json +++ b/src/GitS-Core.package/GSAssetChange.class/methodProperties.json @@ -20,5 +20,5 @@ "saveNewAsset:" : "mad 9/29/2024 17:24", "to" : "mad 9/5/2023 23:00", "update:" : "mad 9/27/2023 16:16", - "workspaceBindings" : "mad 9/13/2023 15:52", + "workspaceBindings" : "mad 10/9/2024 21:56", "workspaceEditTargetString" : "mad 9/13/2023 15:53" } } diff --git a/src/GitS-Core.package/GSConflictingAssetChange.class/instance/workspaceBindings.st b/src/GitS-Core.package/GSConflictingAssetChange.class/instance/workspaceBindings.st index 2d7e200bc..221538c56 100644 --- a/src/GitS-Core.package/GSConflictingAssetChange.class/instance/workspaceBindings.st +++ b/src/GitS-Core.package/GSConflictingAssetChange.class/instance/workspaceBindings.st @@ -1,9 +1,8 @@ workspace workspaceBindings - ^ Dictionary newFrom: { + ^ (Dictionary newFrom: { 'current' -> self left. 'incoming' -> self right. 'base' -> self base. 'resolution' -> self resolution. - } - \ No newline at end of file + }) collect: [:each | each ifNotNil: #asset] \ No newline at end of file diff --git a/src/GitS-Core.package/GSConflictingAssetChange.class/methodProperties.json b/src/GitS-Core.package/GSConflictingAssetChange.class/methodProperties.json index 4987b9711..897e3b633 100644 --- a/src/GitS-Core.package/GSConflictingAssetChange.class/methodProperties.json +++ b/src/GitS-Core.package/GSConflictingAssetChange.class/methodProperties.json @@ -24,5 +24,5 @@ "resolution" : "mad 9/8/2023 12:10", "right" : "mad 9/8/2023 12:09", "update:" : "mad 9/20/2023 17:06", - "workspaceBindings" : "mad 9/13/2023 15:52", + "workspaceBindings" : "mad 10/9/2024 21:56", "workspaceEditTargetString" : "mad 9/13/2023 16:01" } }