遇到如上情况怎么办?简述下我的解决办法,可能不是很完美.
最开始我是本地重新建立readme.txt文件,然后再次git push的;但是在view的时候出现乱码,github给的提示是上传的文件会自动转码为utf8,导致我记事本建立的txt文件预览的时候直接乱码了.
因此我就直接git rm readme.txt但是还有这个历史记录了[最开始的时候我还不知道如何删除文件,度娘下] 我常用的git指令为git add git commit -m "说明文本" git push删除文件后不满意,我还想删除这个文件夹,但是给我error...
过程不赘述了,直接看下面的命令操作,希望对你有所帮助!或者直接跳过看底部参考网址.
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git add .
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git commit -m "删除readme文件"
[main 19fad9e] 删除readme文件
1 file changed, 20 deletions(-)
delete mode 100644 samoye/readme.txt
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 297 bytes | 297.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To github.com:wanghuiwiki/Learning-notes.git
004ae6e..19fad9e main -> main
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ cd ..
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes (main)
$ git rm samoye
fatal: not removing 'samoye' recursively without -r
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes (main)
$ cd samoye
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git rm samoye
fatal: pathspec 'samoye' did not match any files
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ cd ..
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes (main)
$ git rm -f samoye
fatal: not removing 'samoye' recursively without -r
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes (main)
$ git rm -r samoye
Deletion of directory 'samoye' failed. Should I try again? (y/n) y
Deletion of directory 'samoye' failed. Should I try again? (y/n) y
Deletion of directory 'samoye' failed. Should I try again? (y/n)
Sorry, I did not understand your answer. Please type 'y' or 'n'
Deletion of directory 'samoye' failed. Should I try again? (y/n) n
rm 'samoye/demo1.html'
rm 'samoye/demo2.html'
rm 'samoye/demo3.html'
rm 'samoye/demo4.html'
rm 'samoye/images/2dog.jpg'
rm 'samoye/images/demo1.jpg'
rm 'samoye/images/dog.jpg'
rm 'samoye/images/food.jpg'
rm 'samoye/script/script1.js'
rm 'samoye/styles/css1.css'
rm 'samoye/styles/css2.css'
rm 'samoye/styles/css3.css'
rm 'samoye/styles/css4.css'
rm 'samoye/styles/css5.css'
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes (main)
$ cd samoye
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git add .
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git commit -m "删除samoye文件"
[main d0c1130] 删除samoye文件
14 files changed, 211 deletions(-)
delete mode 100644 samoye/demo1.html
delete mode 100644 samoye/demo2.html
delete mode 100644 samoye/demo3.html
delete mode 100644 samoye/demo4.html
delete mode 100644 samoye/images/2dog.jpg
delete mode 100644 samoye/images/demo1.jpg
delete mode 100644 samoye/images/dog.jpg
delete mode 100644 samoye/images/food.jpg
delete mode 100644 samoye/script/script1.js
delete mode 100644 samoye/styles/css1.css
delete mode 100644 samoye/styles/css2.css
delete mode 100644 samoye/styles/css3.css
delete mode 100644 samoye/styles/css4.css
delete mode 100644 samoye/styles/css5.css
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git push
Enumerating objects: 3, done.
Counting objects: 100% (3/3), done.
Delta compression using up to 4 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 239 bytes | 239.00 KiB/s, done.
Total 2 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To github.com:wanghuiwiki/Learning-notes.git
19fad9e..d0c1130 main -> main
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git add .
warning: in the working copy of 'samoye/demo1.html', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'samoye/demo2.html', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'samoye/demo3.html', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'samoye/demo4.html', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'samoye/script/script1.js', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'samoye/styles/css3.css', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'samoye/styles/css4.css', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'samoye/styles/css5.css', LF will be replaced by CRLF the next time Git touches it
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git commit -m "上传samoye文件"
[main aa8daa3] 上传samoye文件
14 files changed, 211 insertions(+)
create mode 100644 samoye/demo1.html
create mode 100644 samoye/demo2.html
create mode 100644 samoye/demo3.html
create mode 100644 samoye/demo4.html
create mode 100644 samoye/images/2dog.jpg
create mode 100644 samoye/images/demo1.jpg
create mode 100644 samoye/images/dog.jpg
create mode 100644 samoye/images/food.jpg
create mode 100644 samoye/script/script1.js
create mode 100644 samoye/styles/css1.css
create mode 100644 samoye/styles/css2.css
create mode 100644 samoye/styles/css3.css
create mode 100644 samoye/styles/css4.css
create mode 100644 samoye/styles/css5.css
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git push
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 4 threads
Compressing objects: 100% (16/16), done.
Writing objects: 100% (20/20), 210.05 KiB | 870.00 KiB/s, done.
Total 20 (delta 4), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (4/4), completed with 1 local object.
To github.com:wanghuiwiki/Learning-notes.git
d0c1130..aa8daa3 main -> main
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git add readme.md
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git commit -m "上传文件说明文件"
[main 85dfcdb] 上传文件说明文件
1 file changed, 25 insertions(+)
create mode 100644 samoye/readme.md
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git push
Enumerating objects: 6, done.
Counting objects: 100% (6/6), done.
Delta compression using up to 4 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 1.45 KiB | 741.00 KiB/s, done.
Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To github.com:wanghuiwiki/Learning-notes.git
aa8daa3..85dfcdb main -> main
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git add readme.md
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git commit -m "实战萨摩耶'猎豹'成长日记"
[main 32f004c] 实战萨摩耶'猎豹'成长日记
1 file changed, 13 insertions(+), 3 deletions(-)
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git push
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 4 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 493 bytes | 493.00 KiB/s, done.
Total 4 (delta 3), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To github.com:wanghuiwiki/Learning-notes.git
85dfcdb..32f004c main -> main
Administrator@WIN-O379IL963GN MINGW64 ~/Desktop/practise/Learning-notes/samoye (main)
$ git push
Everything up-to-date
最后的最后git rm 命令可以参考下菜鸟的:www.runoob.com/git/git-rm.…
演示github为:github.com/wanghuiwiki…
