Skip to content

Commit cdeb29e

Browse files
Merge pull request #60963 from nextcloud/backport/60631/stable34
[stable34] fix(files): show proper information when a move will override the target
2 parents 15db395 + 1537448 commit cdeb29e

283 files changed

Lines changed: 1506 additions & 1717 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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)