Default merge commit message by maoyama · Pull Request #162 · maoyama/Changes (original) (raw)

added 8 commits

June 12, 2025 08:47

Introduced the GitRevParse struct for executing the git rev-parse command.
Added GitRevParseTests to validate the functionality of the GitRevParse command.
Updated project configuration to include new source files and tests.

Created a new file 'DefaultMergeCommitMessage.swift' for managing default commit messages during merges.
Updated the Process extension to make the output method public.

Updated prompt to specify a focus on generating a good commit message for staged changes.
Enhanced clarity on how to handle unstaged and untracked files.

git status --short does not determine whether to merge commit or not, so I always get MERGE_MSG

Included new test for default merge commit message generation.
Updated project.pbxproj to reference the new test file.
Updated subproject commit in SyntaxHighlight.

ProcessError(description: "An error occurred while executing the "git merge _test-fixture-conflict"\n\n\nmerge: _test-fixture-conflict - not something we can merge\n\nDid you mean this?\n\torigin/_test-fixture-conflict\n")

Co-authored-by: Copilot 175728472+Copilot@users.noreply.github.com

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})