feat(move-group): backup merge conflict

wojciech-kulik · wojciech-kulik · commit 9f14df978ec7 · 2025-10-31T16:32:03.000+01:00
diff --git a/Sources/XcodeProjectCLI/Subcommands/Groups/MoveGroupCommand.swift b/Sources/XcodeProjectCLI/Subcommands/Groups/MoveGroupCommand.swift
@@ -83,8 +83,11 @@ struct MoveGroupCommand: ParsableCommand {
                 }
             } else {
                 if fileManager.fileExists(atPath: destPath) {
-                    try fileManager.removeItem(atPath: sourcePath)
-                    print("Warning: File \(item) already exists at destination. Source file has been removed.")
+                    let bakPath = destPath.asInputPath.changeLastComponent(
+                        to: "\(destPath.asInputPath.lastComponent).bak"
+                    ).absolutePath
+                    try fileManager.moveItem(atPath: sourcePath, toPath: bakPath)
+                    print("Warning: File \(item) already exists at destination. Backup created at \(bakPath).")
                 } else {
                     try fileManager.moveItem(atPath: sourcePath, toPath: destPath)
                 }

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,11 @@ struct MoveGroupCommand: ParsableCommand {`
`83`	`83`	`}`
`84`	`84`	`} else {`
`85`	`85`	`if fileManager.fileExists(atPath: destPath) {`
`86`		`- try fileManager.removeItem(atPath: sourcePath)`
`87`		`- print("Warning: File \(item) already exists at destination. Source file has been removed.")`
	`86`	`+ let bakPath = destPath.asInputPath.changeLastComponent(`
	`87`	`+ to: "\(destPath.asInputPath.lastComponent).bak"`
	`88`	`+ ).absolutePath`
	`89`	`+ try fileManager.moveItem(atPath: sourcePath, toPath: bakPath)`
	`90`	`+ print("Warning: File \(item) already exists at destination. Backup created at \(bakPath).")`
`88`	`91`	`} else {`
`89`	`92`	`try fileManager.moveItem(atPath: sourcePath, toPath: destPath)`
`90`	`93`	`}`