fix: avoid edge cases when identifying merge commits. #132
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.
There are ways to have a commit start with "Merge branch" even if it's not a merge commit:
git commit -m "Merge branch ..."
git cherry-pick -m 1 <hash>
, where<hash>
is a merge commit that starts with "Merge branch"git merge <hash> -m "Does not start with Merge branch"
By definition, merge commits are commits with more than one parent commit, so this should be a more robust way of identifying merge commits.
Quality notes: