bug: A lock file already exists in the repository, which blocks this operation from completing.

[linonetwo]

Environment 环境信息

No response

Description 描述

{"callerFunction":"commitAndSync","dir":"E:\wiki\calendar","functionName":"mergeUpstream","handler":"wiki-sync-progress","id":"hGeOuKEK725KQ_6x0uD39","level":"info","message":"GitMergeComplete","step":"GitMergeComplete","timestamp":"2024-07-18T06:24:34.850Z"}
{"callerFunction":"commitAndSync","level":"warn","message":"E-3 failed to config git to successfully pull from or push to remote with configuration {"dir":"E:\\wiki\\calendar","branch":"master","remote":"origin","userInfo":{"gitUserName":"linonetwo","email":"linonel.com","accessToken":"ghp...","branch":"master"}}.\nerrorMessages: Updating 756ddb86..14def78d\nerror: Unable to create 'E:/wiki/calendar/.git/index.lock': File exists.\n\nAnother git process seems to be running in this repository, e.g.\nan editor opened by 'git commit'. Please make sure all processes\nare terminated then try again. If it still fails, a git process\nmay have crashed in this repository earlier:\nremove the file manually to continue.\n GitPullPushError: E-3 failed to config git to successfully pull from or push to remote with configuration {"dir":"E:\\wiki\\calendar","branch":"master","remote":"origin","userInfo":{"gitUserName":"linonetwo","email":"linonetwo012@gmail.com","accessToken":"ghp_dT4C82gBXQ77Vnkde...","branch":"master"}}.\nerrorMessages: Updating 756ddb86..14def78d\nerror: Unable to create 'E:/wiki/calendar/.git/index.lock': File exists.\n\nAnother git process seems to be running in this repository, e.g.\nan editor opened by 'git commit'. Please make sure all processes\nare terminated then try again. If it still fails, a git process\nmay have crashed in this repository earlier:\nremove the file manually to continue.\n\n at C:\Users\linonetwo\AppData\Local\TidGi\app-0.10.3\resources\app.asar.unpacked\.webpack\main\722.index.worker.js:2:409982\n at processTicksAndRejections (node:internal/process/task_queues:95:5)\n at ir (C:\Users\linonetwo\AppData\Local\TidGi\app-0.10.3\resources\app.asar.unpacked\.webpack\main\722.index.worker.js:2:409746)","timestamp":"2024-07-18T06:24:34.938Z"}
{"level":"info","message":"Restarting workspace VKt1l29a3_B7BOIak-BP7","timestamp":"2024-07-18T06:24:34.939Z"}
{"level":"debug","message":"updateLastUrl() Updating lastUrl for workspace VKt1l29a3_B7BOIak-BP7 to tidgi://vkt1l29a3_b7boiak-bp7/#:Index","timestamp":"2024-07-18T06:24:34.939Z"}
{"didFailLoadErrorMessage":null,"isLoading":false,"isRestarting":true,"level":"debug","message":"updateMetaData(VKt1l29a3_B7BOIak-BP7)","timestamp":"2024-07-18T06:24:34.940Z"}
{"level":"debug","message":"worker.beforeExit for VKt1l29a3_B7BOIak-BP7","timestamp":"2024-07-18T06:24:34.940Z"}
{"level":"debug","message":"Thread.terminate for VKt1l29a3_B7BOIak-BP7","timestamp":"2024-07-18T06:24:34.944Z"}
{"homePath":"E:\wiki\wiki","level":"info","message":"NodeJSWiki VKt1l29a3_B7BOIak-BP7 Worker stopped (can be normal quit, or unexpected error, see other logs to determine)","timestamp":"2024-07-18T06:24:35.167Z","worker":"NodeJSWiki"}
{"homePath":"E:\wiki\wiki","level":"info","message":"startWiki() rejected with message.type === 'message' and event.type === 'termination'","timestamp":"2024-07-18T06:24:35.167Z","worker":"NodeJSWiki"}
{"function":"stopWiki","level":"info","message":"Wiki-worker for VKt1l29a3_B7BOIak-BP7 stopped","timestamp":"2024-07-18T06:24:35.168Z"}

Steps to Reproduce 复现方式

.git 里有 index.lock 的情况

Additional Context 额外上下文

No response