Skip to content

Commit e8a8068

Browse files
committed
fix(files): show proper notes about overwriting files when moving
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent d0c2d97 commit e8a8068

3 files changed

Lines changed: 1011 additions & 1015 deletions

File tree

apps/files/src/actions/moveOrCopyAction.ts

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

0 commit comments

Comments
 (0)