Resolve add/add conflict in '.github/workflows/desktop-build.yml' during rebase operation by checking out '--ours' version and continuing. Replit-Commit-Author: Agent Replit-Commit-Session-Id: 9203795e-937a-4306-b81d-b4d5c78c240e Replit-Commit-Checkpoint-Type: full_checkpoint Replit-Commit-Event-Id: f59e76fc-0b28-4029-9347-25ff57288d23 Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/7c94b7a0-29c7-4f2e-94ef-44b2153872b7/9203795e-937a-4306-b81d-b4d5c78c240e/lX9tyiI Replit-Helium-Checkpoint-Created: true |
||
|---|---|---|
| .. | ||
| Pasted--workspace-git-pull-rebase-origin-main-From-https-githu_1764978472462.txt | ||
| Pasted-index-DqjNa4LQ-js-1158-Skipped-loading-agent-runtime-Er_1764725788566.txt | ||
| Pasted-PostComposer-tsx-231-Error-submitting-post-SyntaxError-Failed-to-execute-json-on-Response-Une-1764789192494_1764789192496.txt | ||
| Screenshot_20251205_163155_Replit_1764977541370.jpg | ||