Skip to content

Commit 19dfe78

Browse files
authored
Merge pull request #16 from swade1987/merge-fix-2
fix: improve branch reference handling and git identity
2 parents 1c736ce + b7c34be commit 19dfe78

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Diff for: kustdiff

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ function main {
6363
validate_root_dir
6464
validate_max_depth
6565

66+
# Set up git identity for merge operations
67+
git config --global user.email "github-actions@github.com" || true
68+
git config --global user.name "GitHub Actions" || true
69+
6670
git config --global --add safe.directory "$GITHUB_WORKSPACE" || true
6771

6872
# Save current state to restore later

0 commit comments

Comments
 (0)