Problem with git merge
未关闭
- 主要语言
- C++
- 星标
- 9.9k
- 派生
- 544
- PR 合并指标
- 30 天内没有已合并 PR
描述
Hello,
Thank you for this great tool. I don't know why, but I can't merge two branches that are supported by git-crypt... If I tried, the conflicted files are not changed at all, and I can't find any `<<<<<< HEAD` inside.
I'm using git-crypt 0.6.0, from debian unstable repository. Maybe it's related to this PR: https://github.com/AGWA/git-crypt/pull/107/commits/7a231050232eda53ca63aa6cc124113ae6ff8270
Thank you!
贡献指南
评估
这个 Issue 还没有评估数据。