我不是Google的专家。更不用说,我甚至不确定这意味着什么或如何解决它?
>> git merge admin_playground
error: Untracked working tree file 'vendor/gems/panda-1.0.0/.gitignore' would be overwritten by merge.
fatal: merging of trees 538b2824765956cc44c42a8ad628e4f4 and d5d4cda68518cd1c81bf70ba8c339fea6 failed
我正在尝试执行git合并,但遇到了失败的语句。