From a073c4c3232fc514df7624a3ec239bdbd972b366 Mon Sep 17 00:00:00 2001
From: John Ajera <37360952+jajera@users.noreply.github.com>
Date: Wed, 31 Dec 2025 00:44:22 +0000
Subject: [PATCH] fix: update githubx_repository_file resource

resolves the inconsistent state error
---
 internal/provider/resource_repository_file.go | 6 +++++-
 tools.go                                      | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/provider/resource_repository_file.go b/internal/provider/resource_repository_file.go
index 4b4fafc..de3b1cf 100644
--- a/internal/provider/resource_repository_file.go
+++ b/internal/provider/resource_repository_file.go
@@ -846,7 +846,11 @@ func (r *repositoryFileResource) readFile(ctx context.Context, owner, repoName,
 			model.CommitSHA = types.StringValue(commit.GetSHA())
 
 			if commit.Commit != nil {
-				model.CommitMessage = types.StringValue(commit.Commit.GetMessage())
+				// Only set commit message if not already set to preserve user-provided value
+				// (GitHub may normalize trailing newlines)
+				if model.CommitMessage.IsNull() || model.CommitMessage.IsUnknown() {
+					model.CommitMessage = types.StringValue(commit.Commit.GetMessage())
+				}
 
 				if commit.Commit.Committer != nil {
 					commitAuthor := commit.Commit.Committer.GetName()
diff --git a/tools.go b/tools.go
index 704890a..f4d4261 100644
--- a/tools.go
+++ b/tools.go
@@ -15,3 +15,4 @@ import (
 
 
 
+