Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add persistent cherry pick strategy #353

Merged
merged 34 commits into from
Jul 29, 2023

Conversation

frankdekker
Copy link
Member

@frankdekker frankdekker commented Jul 29, 2023

Add cherry pick strategy that will continue cherry-picking on merge conflicts. Each merge conflict resolution will be resolved by taking theirs.

@codecov
Copy link

codecov bot commented Jul 29, 2023

Codecov Report

Merging #353 (e9f2560) into master (6237738) will not change coverage.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##              master      #353   +/-   ##
===========================================
  Coverage     100.00%   100.00%           
- Complexity      2584      2610   +26     
===========================================
  Files            447       452    +5     
  Lines           7741      7814   +73     
===========================================
+ Hits            7741      7814   +73     
Files Changed Coverage Δ
src/Entity/Git/Diff/DiffFile.php 100.00% <ø> (ø)
.../CodeHighlight/CacheableHighlightedFileService.php 100.00% <100.00%> (ø)
src/Service/Git/AbstractGitCommandBuilder.php 100.00% <100.00%> (ø)
...ice/Git/CherryPick/GitCherryPickCommandBuilder.php 100.00% <100.00%> (ø)
src/Service/Git/CherryPick/GitCherryPickParser.php 100.00% <100.00%> (ø)
...rc/Service/Git/CherryPick/GitCherryPickService.php 100.00% <100.00%> (ø)
src/Service/Git/Commit/GitCommitCommandBuilder.php 100.00% <100.00%> (ø)
src/Service/Git/Commit/GitCommitService.php 100.00% <100.00%> (ø)
src/Service/Git/GitCommandBuilderFactory.php 100.00% <100.00%> (ø)
src/Service/Git/GitRepositoryLockManager.php 100.00% <100.00%> (ø)
... and 4 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@frankdekker frankdekker merged commit a679a71 into master Jul 29, 2023
5 checks passed
@frankdekker frankdekker deleted the Add-persistent-cherry-pick-strategy branch July 29, 2023 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant