rebase rework

backend/src/api/routes/git_schemas.py

@@ -126,6 +126,42 @@ class ConflictResolution(BaseModel):
     content: Optional[str] = None
 # [/DEF:ConflictResolution:Class]
 
+
+# [DEF:MergeStatusSchema:Class]
+# @PURPOSE: Schema representing unfinished merge status for repository.
+class MergeStatusSchema(BaseModel):
+    has_unfinished_merge: bool
+    repository_path: str
+    git_dir: str
+    current_branch: str
+    merge_head: Optional[str] = None
+    merge_message_preview: Optional[str] = None
+    conflicts_count: int = 0
+# [/DEF:MergeStatusSchema:Class]
+
+
+# [DEF:MergeConflictFileSchema:Class]
+# @PURPOSE: Schema describing one conflicted file with optional side snapshots.
+class MergeConflictFileSchema(BaseModel):
+    file_path: str
+    mine: Optional[str] = None
+    theirs: Optional[str] = None
+# [/DEF:MergeConflictFileSchema:Class]
+
+
+# [DEF:MergeResolveRequest:Class]
+# @PURPOSE: Request schema for resolving one or multiple merge conflicts.
+class MergeResolveRequest(BaseModel):
+    resolutions: List[ConflictResolution] = Field(default_factory=list)
+# [/DEF:MergeResolveRequest:Class]
+
+
+# [DEF:MergeContinueRequest:Class]
+# @PURPOSE: Request schema for finishing merge with optional explicit commit message.
+class MergeContinueRequest(BaseModel):
+    message: Optional[str] = None
+# [/DEF:MergeContinueRequest:Class]
+
 # [DEF:DeploymentEnvironmentSchema:Class]
 # @PURPOSE: Schema for representing a target deployment environment.
 class DeploymentEnvironmentSchema(BaseModel):