在我第一次尝试提交几个大文件夹(angular和django)后,git回复:
$sql = "SELECT s.question_id
FROM table_question s
WHERE s.chapter_id = $chapter_id
AND s.publish_status = ".PUBLISHED_ACTIVE." AND (
s.format_type_id = ".QST_TYPE_OBJECTIVE." OR (s.format_type_id = ".QST_TYPE_SHORT_ANSWER." AND s.question_id < 200000 AND s.publish_status = ".PUBLISHED_ACTIVE."))
ORDER BY RAND() LIMIT 5";
$obj_question_ids = DB::connection('mysql_question')->select(DB::raw($sql));
以前的帖子建议:
删除.git文件夹中的index.lock。
我已经完成了这个,但是第二个我重新提交“git add。”作为我的git push origin master例程的一部分,index.lock文件重新出现在.git中
还有其他解决方案吗?这是怎么回事?
我已经尝试了评论链接中的所有建议
我正在处理这个问题:
Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.
答案 0 :(得分:0)
就我而言,index.lock不会被删除。相反,我发现我的一个django文件夹没有.gitignore,所以我创建了一个并包含以下文件:
include
lib
include
bin
.vscode
你可能想要包括更多或更少,取决于..显然,我试图推送一个不同意git的文件。