Add WorkingCopy::merge() to support git merge - #248
Merged
Conversation
Mirrors the existing checkout() method: accepts a Commit, Reference or string revision, plus optional extra CLI args (e.g. ['--no-ff']).
CI runners have no global git user.name/email, so the merge commit creation failed with "Committer identity unknown". Set a local identity on the test repository first, matching the pattern already used in ReferenceTest and LogTest for commit-creating tests.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
merge()method onWorkingCopy, mirroring the existingcheckout()method: it accepts aCommit,Reference, orstringrevision, plus an optional array of extra CLI arguments (e.g.['--no-ff']).doc/workingcopy.md.Test plan
testMerge(clean merge produces a 2-parent merge commit) andtestMergeConflict(conflicting merge throwsRuntimeException) toWorkingCopyTest.vendor/bin/phpunit— 226 tests, 565 assertions, all green.castor cs --dry-run— no issues.castor phpstan— no errors.