New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUG] 在3way模式下解决冲突后，通过资源管理面板提交会报错文件未保存 #4187

Open

wangxiaojuan opened this issue Nov 28, 2024 · 0 comments · Fixed by #4220

Labels

🐞 bug

Contributor

wangxiaojuan commented Nov 28, 2024

描述你的问题（Describe the bug）

复现路径（To Reproduce）

解决冲突场景使用3way解决冲突
通过UI的方式提交会报错

预期表现（Expected behavior）

环境信息（Environment）

OS: [e.g. macOS 11.2 Apple M1/Windows10/Windows11]
Browser: [e.g. chrome, safari, electron]
OpenSumi Version: [e.g. 2.13.0]

wangxiaojuan added the 🐞 bug label

Ricbet linked a pull request

that will close this issue

fix: 3-way git dirty status #4220

Merged

1 task

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment