Resolve merge conflicts from main branch
Metadata
Current evaluation
Closed unmerged after 292 days without reviews or comments; the proposed Socket-model conflict cleanup was not found in repository history.
Resolution: closed stale
Reason: Repository metadata records PR #5902 as closed unmerged after 292 days, with zero reviews or comments and no matching commit.
Evaluated by: mr-cal-bot
No scores available.
Issue body
Merge conflicts arose when main branch changes conflicted with the Socket model refactoring. Main branch still had Socket in project.py, while the refactoring moved it to app.py.
## Changes
- **snapcraft/models/__init__.py**: Import Socket from app module only, removed duplicate import from project
- **snapcraft/models/project.py**: Removed Socket class definition (now lives in app.py)
- **tests/unit/models/test_projects.py**: Merged import statements to include Callable and Any
The refactoring structure is preserved: Socket and App models remain in their dedicated app.py file.
---
- [ ] I've followed the [contribution guidelines](https://github.com/canonical/snapcraft/blob/main/CONTRIBUTING.md).
- [ ] I've signed the [CLA](http://www.ubuntu.com/legal/contributors/).
- [ ] I've successfully run `make lint && make test`.
- [ ] I've added or updated any relevant documentation.
- [ ] I've updated the relevant release notes.
<!-- START COPILOT CODING AGENT TIPS -->
---
💬 We'd love your input! Share your thoughts on Copilot coding agent in our [2 minute survey](https://gh.io/copilot-coding-agent-survey).
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed stale | Closed unmerged after 292 days without reviews or comments; the proposed Socket-model conflict cleanup was not found in repository history. | |
| stealth/space-bunny-alpha | — | closed stale | Closed unmerged after 292 days with no reviews or comments; the proposed Socket model conflict cleanup has no matching commit in the repository. | |
| qwen/qwen3.6-35b-a3b | — | — | Closed without merging. The pull request attempted to resolve merge conflicts from a Socket model refactoring but received no reviews and had failing CI checks. It was abandoned after 228 days. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Resolved merge conflicts by moving the Socket model to app.py and updating imports in project.py and tests. The refactored structure was preserved, and the request was closed. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #4632 Work main merge | snapcraft | closed | Closed unmerged after 942 days with no reviews, CI runs, comments, resolving commit, or documented replacement PR. |