Skip to content

Conversation

@maxsours
Copy link
Contributor

The last PR had a merge conflict with main. I thought I had it resolved, but it turns out I missed one. I'm honestly surprised that both VSCode and Github let me merge a PR that still had a conflict. I guess the text highlighting the conflict was just naively added to the workflow file. This broke the file of course, but it still let me merge. Very strange. Anyway, let's fix this.

The last PR had a merge conflict with main. I thought I had it
resolved, but it turns out I missed one. I'm honestly surprised that
both VSCode and Github let me merge a PR that still had a conflict. I
guess the text highlighting the conflict was just naively added to
the workflow file. This broke the file of course, but it still let me
merge. Very strange. Anyway, let's fix this.
@maxsours maxsours requested a review from a team as a code owner January 31, 2025 16:50
@maxsours maxsours merged commit b8d018d into main Jan 31, 2025
10 checks passed
@maxsours maxsours deleted the pipeline-fix branch January 31, 2025 17:26
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.

3 participants