Error pulling origin: error: The following untracked working tree files would be overwritten by...
Error The by be ... Tree Files Origin
2023-09-14 09:07:57 时间
git在pull时,出现这样的错误的时候,可能非常多人进进行stash。相关stash的请看:Error pulling origin: error: Your local changes to the following files would be overwritten by merge
可是发现stash后还是会出现:Error pulling origin: error: The following untracked working tree files would be overwritten by merge...
事实上你看错误提示就知道了,是由于一些untracked working tree files引起的问题。
所以仅仅要攻克了这些untracked的文件就能解决问题。
解决有两种方式:
方式一:假设你有安装git的工具。当然是图形化工具,比方tortoiseGit。你能够通过这些工具,选中你的project目录,右键cleanup。
方式二:通过命令行。你直接运行git clean -d -fx就可以。可能非常多人都不明确-d,-fx究竟是啥意思,下一篇关于git的文章会介绍下git clean相关的东西。
相关文章
- gyp ERR stack Error: Command failed: D:pythonpython.EXE -c import sys; print
- ORA-00366: log string of thread string, checksum error in the file header ORACLE 报错 故障修复 远程处理
- ORA-21528: internal error, image could not be understood ORACLE 报错 故障修复 远程处理
- ORA-26748: The one-to-one transformation function string encountered the following error: string ORACLE 报错 故障修复 远程处理
- ORA-29848: error occurred in the execution of ODCIINDEXMERGEPARTITION routine ORACLE 报错 故障修复 远程处理
- MySQL Error number: 3035; Symbol: ER_GIS_UNKNOWN_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: 3044; Symbol: ER_STD_BAD_ALLOC_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: 3047; Symbol: ER_STD_INVALID_ARGUMENT; SQLSTATE: HY000 报错 故障修复 远程处理
- ORA-48106: error initializing the ADR string object ORACLE 报错 故障修复 远程处理
- ORA-48405: The option in the command is invalid ORACLE 报错 故障修复 远程处理
- ORA-48414: The string in the execution option exceeds maximum length [string] ORACLE 报错 故障修复 远程处理
- MySQL Error number: 3772; Symbol: ER_DEFAULT_VAL_GENERATED_VARIABLES; SQLSTATE: HY000 报错 故障修复 远程处理
- ORA-54657: CREATE_TIN: error writing TIN LOB ORACLE 报错 故障修复 远程处理
- MySQL Error number: 4086; Symbol: ER_TOO_MANY_WINDOWS; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: 4138; Symbol: ER_BULK_READER_COMMUNICATION_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-010214; Symbol: ER_JSON_PARSE_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-010686; Symbol: ER_NDB_BINLOG_UNHANDLED_ERROR_FOR_TABLE; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-010911; Symbol: ER_RPL_CANT_HAVE_SAME_BASENAME; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-011008; Symbol: ER_DD_UPGRADE_TABLE_STATS_MIGRATE_COMPLETED; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-011445; Symbol: ER_GRP_RPL_EVENT_HANDLING_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-011533; Symbol: ER_GRP_RPL_APPLIER_THD_SETUP_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-011601; Symbol: ER_GRP_RPL_CANNOT_EXECUTE_TRANS_IN_ERROR_STATE; SQLSTATE: HY000 报错 故障修复 远程处理
- ORA-07261: spdde: kill error, unable to send signal to process. ORACLE 报错 故障修复 远程处理
- MySQL Error number: MY-012086; Symbol: ER_IB_MSG_261; SQLSTATE: HY000 报错 故障修复 远程处理
- ORA-13703: The snapshot pair [string, string] for database_id string and instance_id string are not found in the current repository. ORACLE 报错 故障修复 远程处理
- 解决MySQL添加新用户-ERROR 1045 (28000)的问题
- MySQL Error number: MY-012925; Symbol: ER_IB_MSG_1100; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-013140; Symbol: ER_ERROR_INFO_FROM_DA; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-013205; Symbol: ER_GRP_RPL_ERROR_GTID_SET_EXTRACTION; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-013239; Symbol: ER_PLUGIN_UNINSTALL_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-013341; Symbol: ER_LDAP_MAPPING_USER_DONT_BELONG_GROUP; SQLSTATE: HY000 报错 故障修复 远程处理
- MySQL Error number: MY-013925; Symbol: ER_COMPONENT_EE_DATA_ENCRYPTION_ERROR; SQLSTATE: HY000 报错 故障修复 远程处理
- The Power of ‘if z’ in the Linux World