feat(server): add comprehensive Git repository services with test coverage

- Implement ArchiveService for repository archive operations
- Add BlameService for Git blame functionality
- Create BranchService with full branch management capabilities
- Integrate CommitService for commit operations and history
- Add DiffService for generating diffs and patches
- Implement MergeService with conflict resolution features
- Add PackService for Git packfile operations
- Create TagService for Git tag management
- Add TreeService for Git tree operations
- Implement comprehensive repository management functions
- Add repository statistics and health checking capabilities
- Include garbage collection and repacking operations
- Add repository configuration management
- Implement error handling and status conversion utilities
- Add test suite covering all repository operations
- Create utility functions for Git command execution
- Add streaming response support for large data operations
- Implement request resolution and validation helpers

server/merge.rs

@@ -0,0 +1,56 @@
+use crate::pb::*;
+
+use super::{GitksService, into_status, resolve};
+
+#[tonic::async_trait]
+impl merge_service_server::MergeService for GitksService {
+    async fn check_merge(
+        &self,
+        request: tonic::Request<CheckMergeRequest>,
+    ) -> Result<tonic::Response<MergeResult>, tonic::Status> {
+        let inner = request.into_inner();
+        let gb = resolve(inner.repository.as_ref())?;
+        let resp = gb.check_merge(inner).map_err(into_status)?;
+        Ok(tonic::Response::new(resp))
+    }
+
+    async fn merge(
+        &self,
+        request: tonic::Request<MergeRequest>,
+    ) -> Result<tonic::Response<MergeResult>, tonic::Status> {
+        let inner = request.into_inner();
+        let gb = resolve(inner.repository.as_ref())?;
+        let resp = gb.merge(inner).map_err(into_status)?;
+        Ok(tonic::Response::new(resp))
+    }
+
+    async fn list_merge_conflicts(
+        &self,
+        request: tonic::Request<ListMergeConflictsRequest>,
+    ) -> Result<tonic::Response<ListMergeConflictsResponse>, tonic::Status> {
+        let inner = request.into_inner();
+        let gb = resolve(inner.repository.as_ref())?;
+        let resp = gb.list_merge_conflicts(inner).map_err(into_status)?;
+        Ok(tonic::Response::new(resp))
+    }
+
+    async fn resolve_merge_conflicts(
+        &self,
+        request: tonic::Request<ResolveMergeConflictsRequest>,
+    ) -> Result<tonic::Response<MergeResult>, tonic::Status> {
+        let inner = request.into_inner();
+        let gb = resolve(inner.repository.as_ref())?;
+        let resp = gb.resolve_merge_conflicts(inner).map_err(into_status)?;
+        Ok(tonic::Response::new(resp))
+    }
+
+    async fn rebase(
+        &self,
+        request: tonic::Request<RebaseRequest>,
+    ) -> Result<tonic::Response<RebaseResult>, tonic::Status> {
+        let inner = request.into_inner();
+        let gb = resolve(inner.repository.as_ref())?;
+        let resp = gb.rebase(inner).map_err(into_status)?;
+        Ok(tonic::Response::new(resp))
+    }
+}