Function TestUpdateCommand_MergeIsDefault

pkg/cli/update_integration_test.go:301–360

--- Merge Behavior Integration Tests --- TestUpdateCommand_MergeIsDefault verifies that merge is the default behavior when a workflow has local modifications.

(t *testing.T)

// TestUpdateCommand_MergeIsDefault verifies that merge is the default behavior
// when a workflow has local modifications.
func TestUpdateCommand_MergeIsDefault(t *testing.T) {
	skipWithoutGitHubAuth(t)

	setup := setupUpdateIntegrationTest(t)
	defer setup.cleanup()

	// Create a workflow with a source field that can be fetched
	workflowContent := `---
source: github/gh-aw/.github/workflows/smoke-test-push.md@main
on:
  workflow_dispatch:

permissions:
  contents: read
---

# Test Workflow

Local modification that should be preserved during merge.
`
	workflowPath := filepath.Join(setup.workflowsDir, "test-update.md")
	require.NoError(t, os.WriteFile(workflowPath, []byte(workflowContent), 0644))

	// Commit the workflow to git so hasLocalModifications can detect changes
	gitAdd := exec.Command("git", "add", "-A")
	gitAdd.Dir = setup.tempDir
	require.NoError(t, gitAdd.Run(), "Failed to git add")

	gitCommit := exec.Command("git", "commit", "-m", "initial commit")
	gitCommit.Dir = setup.tempDir
	require.NoError(t, gitCommit.Run(), "Failed to git commit")

	// Make a local modification
	modifiedContent := strings.Replace(workflowContent,
		"Local modification that should be preserved during merge.",
		"This is my custom local addition.\n\nLocal modification that should be preserved during merge.",
		1)
	require.NoError(t, os.WriteFile(workflowPath, []byte(modifiedContent), 0644))

	// Run update with default merge behavior (no --no-merge flag)
	cmd := exec.Command(setup.binaryPath, "update", "test-update", "--verbose")
	cmd.Dir = setup.tempDir
	output, _ := cmd.CombinedOutput()
	outputStr := string(output)

	// The command should produce output (may succeed or fail depending on
	// source repo accessibility, but must attempt merge, not override).
	t.Logf("Update output: %s", outputStr)
	assert.NotEmpty(t, outputStr, "Update command should produce output")

	// Verify it does NOT report "override mode" — merge is the default
	assert.NotContains(t, outputStr, "Using override mode",
		"Default behavior should use merge, not override")

	// Read the resulting workflow file to verify it still exists
	updatedContent, err := os.ReadFile(filepath.Join(setup.workflowsDir, "test-update.md"))
	require.NoError(t, err, "Workflow file should still exist after update")
	assert.Contains(t, string(updatedContent), "Local modification",