Upstream integration: Update the types

Update the types of the resolution, in order to match what’s expected from the backend

Author: estib-vega

apps/desktop/src/components/IntegrateUpstreamModal.svelte

@@ -107,7 +107,7 @@
 				const dontDelete = someBranchesShouldNotBeDeleted(status.stack.heads.map((b) => b.name));
 
 				results.set(status.stack.id, {
-					branchId: status.stack.id,
+					stackId: status.stack.id,
 					approach: getResolutionApproachV3(status),
 					deleteIntegratedBranches: !dontDelete,
 					forceIntegratedBranches

apps/desktop/src/lib/upstream/types.ts

@@ -49,7 +49,7 @@ export type ResolutionApproach = {
 };
 
 export type Resolution = {
-	branchId: string;
+	stackId: string;
 	approach: ResolutionApproach;
 	deleteIntegratedBranches: boolean;
 	forceIntegratedBranches: string[];