remove merge.commit command #5922
Merged
Conversation
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
|
Some tests with 'continue-on-error: true' have failed:
Created by continue-on-error-comment |
aryairani
reviewed
Oct 14, 2025
| -- currently distinguished in the database, so we first just switch on whether its name begins with "merge-". If it | ||
| -- does, then we get the branch's parent, which should exist, but perhaps wouldn't if the user had manually made a | ||
| -- parentless branch called "merge-whatever" for whatever reason. | ||
| getMergeBranchParent :: Sqlite.ProjectBranch -> Maybe ProjectBranchId |
Contributor
There was a problem hiding this comment.
Were these kind of leftover anyway from when we switched to the db table?
aryairani
approved these changes
Oct 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Overview
This PR removes
merge.commitin favor ofupdate.