Remove stray merge conflict markers from adoption_repository.go#60
Closed
Copilot wants to merge 2 commits intodashboard-statsfrom
Closed
Remove stray merge conflict markers from adoption_repository.go#60Copilot wants to merge 2 commits intodashboard-statsfrom
Copilot wants to merge 2 commits intodashboard-statsfrom
Conversation
Draft
Co-authored-by: pasibun <9033551+pasibun@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update dashboard stats based on feedback
Remove stray merge conflict markers from adoption_repository.go
Feb 24, 2026
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
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.
Two
<<<<<<< HEADconflict markers were left in a SQL query string insideGetTimeline, causing a compilation failure. The surrounding code was otherwise correct.Changes
pkg/api_client/repositories/adoption_repository.go: Removed two orphaned<<<<<<< HEADlines (no=======/>>>>>>>counterparts) from thefmt.SprintfSQL template — the intended logic (WHERE created_at < pr.period_end_exclusive) was already in place on both occurrences.💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.