Error when switching branch

未关闭
#337 2 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看

还没有人认领这个 Issue。

评估

难度
4/5
预计耗时
3-5 天
新手友好度
22/100
Issue 类型
缺陷
描述清晰度
需要澄清
活跃度
活跃
技术栈
cpp, git
领域
devtools

调研方向

The checkout failure is reported at _checkout_branch in src/git_plugin.cpp, around line 561, where a conflict makes checkout fail with error -13. Reproduce by making a branch, pushing it, and switching to it in a project with local changes, then read how that function handles conflicts. The Godot engine errors in the log come from a different repository, so they are not the place to fix. Done means switching branches works after a reload, and the conflict case is handled or reported clearly.

由索引模型根据 Issue 内容生成。

描述

bug
Godot version

4.6.3

Godot Git Plugin version

3.3.0

System information

Linux

Issue description

Error when switching branch:

ERROR: core/object/message_queue.cpp:222 - Error calling deferred method: 'EditorNode::EditorNode::_set_main_scene_state': Cannot convert argument 2 from Object to Object.
Steps to reproduce
  • switch branch

Update:

Error when switching to a new branch after the first push:

  ERROR: core/variant/variant_utility.cpp:1024 - GitPlugin: Could not checkout branch tree. Error -13: 1 conflict prevents checkout in godot-git-plugin/src/git_plugin.cpp:_checkout_branch#L561
  ERROR: core/object/message_queue.cpp:222 - Error calling deferred method: 'EditorNode::EditorNode::_set_main_scene_state': Cannot convert argument 2 from Object to Object.

Also after reloading the project, I can't switch to the new branch any more! :(

主要语言
C++
星标
966
派生
100
PR 合并指标
30 天内没有已合并 PR

环境准备

这个项目没有提供开发容器、Dockerfile 或贡献指南,环境需要你自己搭建:先看它的 README,通用步骤见我们的新手贡献指南。

从这里开始

  1. 先读完整个 Issue,再读项目的贡献指南。
  2. 在 Issue 下留言说明你要接手 —— 这能避免两个人做同样的事。
  3. Fork 仓库,在一个分支上完成修改。
  4. 提交 Pull Request,并在描述里引用这个 Issue 编号。

godotengine/godot-git-plugin 的其他 Issue

查看 godotengine/godot-git-plugin 的全部 Issue

相似的 Issue

更多 C++ Issue

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。