svn
关注
分享
扫一扫
文章平均质量分 51
timtian008
让更多的程序员多一份管道收入
展开
-
Git：冲突--error: Your local changes to the following files would be overwritten
error: Your local changes to the following files would be overwritten by merge: protected/config/main.php Please, commit your changes or stash them before you can merge.保留服务器上所做的改动,并入新配置原创 2017-07-17 22:18:53 · 450 阅读 · 0 评论 -
解决SVN误操作--使用Git仓库中恢复已删除的分支、文件或丢失的操作
timtiandeiMac:WelfareManager timtian$ git branch recover_branch[tzfhead] 99fbfd5 fatal: 'recover_branch[tzfhead]' is not a valid branch name.timtiandeiMac:WelfareManager timtian$ git reflogwarning:原创 2017-02-22 14:12:53 · 1979 阅读 · 0 评论