[Bug] 'nothing to commit' error occured when I resolve conflict

Carrotzpc commented 8 months ago

💻 系统环境 | Operating System

Windows

🐛 问题描述 | Bug Description

[Nest] 1  - 03/26/2024, 3:25:57 PM   ERROR [AllExceptionFilter] huangzhao(User)@::ffff:172.16.156.253 [CJ1z0byltGajjHW78cGt1] POST /-/yunti/api resolveConflict- - [500] - => QueryFailedError: nothing to commit
    at Query.onResult (/usr/src/app/node_modules/.pnpm/typeorm@0.3.17_ioredis@5.3.2_mysql2@3.6.5_ts-node@10.9.1/node_modules/typeorm/driver/mysql/MysqlQueryRunner.js:158:37)
    at Query.execute (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/commands/command.js:36:14)
    at PoolConnection.handlePacket (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/connection.js:478:34)
    at PacketParser.onPacket (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/connection.js:97:12)
    at PacketParser.executeStart (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/packet_parser.js:75:16)
    at Socket.<anonymous> (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/connection.js:104:25)
    at Socket.emit (node:events:513:28)
    at addChunk (node:internal/streams/readable:324:12)
    at readableAddChunk (node:internal/streams/readable:297:9)
    at Readable.push (node:internal/streams/readable:234:10)
[Nest] 1  - 03/26/2024, 3:25:57 PM   ERROR [AllExceptionFilter] ER_UNKNOWN_ERROR
mutation resolveConflict($conflictResolveInput: ConflictResolveInput!) {
  resolveConflict(conflictResolveInput: $conflictResolveInput)
}
[Nest] 1  - 03/26/2024, 3:25:57 PM   ERROR [mutation resolveConflict($conflictResolveInput: ConflictResolveInput!) {
  resolveConflict(conflictResolveInput: $conflictResolveInput)
}] Object:
[
  {
    "message": "nothing to commit",
    "locations": [
      {
        "line": 2,
        "column": 3
      }
    ],
    "path": [
      "resolveConflict"
    ]
  }
]

huangzhao(User)@::ffff:172.16.156.253 [CJ1z0byltGajjHW78cGt1] POST /-/yunti/api resolveConflict
[Nest] 1  - 03/26/2024, 3:25:57 PM   ERROR - - [undefined] undefined => QueryFailedError: nothing to commit
    at Query.onResult (/usr/src/app/node_modules/.pnpm/typeorm@0.3.17_ioredis@5.3.2_mysql2@3.6.5_ts-node@10.9.1/node_modules/typeorm/driver/mysql/MysqlQueryRunner.js:158:37)
    at Query.execute (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/commands/command.js:36:14)
    at PoolConnection.handlePacket (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/connection.js:478:34)
    at PacketParser.onPacket (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/connection.js:97:12)
    at PacketParser.executeStart (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/packet_parser.js:75:16)
    at Socket.<anonymous> (/usr/src/app/node_modules/.pnpm/mysql2@3.6.5/node_modules/mysql2/lib/connection.js:104:25)
    at Socket.emit (node:events:513:28)
    at addChunk (node:internal/streams/readable:324:12)
    at readableAddChunk (node:internal/streams/readable:297:9)
    at Readable.push (node:internal/streams/readable:234:10)
[Nest] 1  - 03/26/2024, 3:25:57 PM     LOG <-- huangzhao(User)@::ffff:172.16.156.253 [CJ1z0byltGajjHW78cGt1] POST /-/yunti/api?o=resolveConflict resolveConflict [200] 221ms
[Nest] 1  - 03/26/2024, 3:26:02 PM     LOG --> huangzhao(User)@::ffff:172.16.156.253 [KNUTXoMJcd4lAD--Z0Miv] POST /-/yunti/api?o=getCurrentUser getCurrentUser

🚦 期望结果 | Expected Behavior

No response

📷 复现步骤 | Recurrence Steps

No response

📝 补充信息 | Additional Information

No response

yunti-bot commented 8 months ago

👀 @Carrotzpc Thank you for raising an issue. We will investigate into the matter and get back to you as soon as possible. Please make sure you have given us as much context as possible.\ 非常感谢您提交 issue。我们会尽快调查此事，并尽快回复您。请确保您已经提供了尽可能多的背景信息。

yunti-bot commented 8 months ago

✅ @Carrotzpc
This issue is closed, If you have any questions, you can comment and reply.\ 此问题已经关闭。如果您有任何问题，可以留言并回复。

yuntijs / yunti