Skip to content

Conversation

@ydah
Copy link
Member

@ydah ydah commented Mar 1, 2025

No description provided.

if has_conflict
io << "\n\n"
end
has_conflict
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nits] I prefer to keep io << "\n\n" in #report_conflicts.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed! revert: d1eb255

@ydah ydah merged commit a9e8b00 into ruby:master Mar 2, 2025
22 checks passed
@ydah ydah deleted the refactor-conflicts branch March 2, 2025 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants