Skip to content

Commit ac32ae4

Browse files
susnuxbackportbot[bot]
authored andcommitted
fix(files): show proper notes about overwriting files when moving
fix(files): show proper notes about overwriting files when moving Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de> [skip ci]
1 parent 53492f9 commit ac32ae4

4 files changed

Lines changed: 288 additions & 422 deletions

File tree

apps/files/src/actions/moveOrCopyAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export async function* handleCopyMoveNodesTo(nodes: INode[], destination: IFolde
134134
if (method === MoveCopyAction.MOVE) {
135135
// Let the user choose what to do with the conflicting files
136136
const content = otherNodes.filter((n) => conflicts.some((c) => c.basename === n.basename))
137-
const result = await openConflictPicker(destination.path, conflicts, content)
137+
const result = await openConflictPicker(destination.path, conflicts, content, { overwriting: true })
138138
if (!result) {
139139
// User cancelled
140140
return

0 commit comments

Comments
 (0)