From 397c4e1386635201ac025b769fe8f6fef1a32a6a Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 22:46:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=BF=BD=E7=95=A5.idea=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5ff6309..a879ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ target/ !**/src/test/**/target/ ### IntelliJ IDEA ### +.idea/ .idea/modules.xml .idea/jarRepositories.xml .idea/compiler.xml From 06b0f2c13817a80d4f7d7c0d55149e1a029f0ce3 Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 22:50:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=BF=BD=E7=95=A5.idea=E6=96=87=E4=BB=B6,?= =?UTF-8?q?=E6=B1=82=E6=B1=82=E4=BD=A0=E4=BA=86=E8=B5=B6=E7=B4=A7=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a879ee7..cb3cbb1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,10 @@ target/ !**/src/test/**/target/ ### IntelliJ IDEA ### -.idea/ +.idea/encodings.xml +.idea/misc.xml +.idea/vcs.xml +.idea/workspace.xml .idea/modules.xml .idea/jarRepositories.xml .idea/compiler.xml From ef3d2de757a408b9c98c1418921dc413512e0bf3 Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 22:51:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BF=BD=E7=95=A5.idea=E6=96=87=E4=BB=B6,?= =?UTF-8?q?=E6=B1=82=E6=B1=82=E4=BD=A0=E4=BA=86=E8=B5=B6=E7=B4=A7=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cb3cbb1..5404a5c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ target/ !**/src/test/**/target/ ### IntelliJ IDEA ### +.idea/libraries/ .idea/encodings.xml .idea/misc.xml .idea/vcs.xml @@ -11,7 +12,6 @@ target/ .idea/modules.xml .idea/jarRepositories.xml .idea/compiler.xml -.idea/libraries/ *.iws *.iml *.ipr From 02c0d23e26550e0b1af77f0d7e14bf601934eb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9F=E4=BA=91=E6=B5=A9?= Date: Sun, 26 Mar 2023 14:54:06 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20.ide?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 7 -- .idea/misc.xml | 14 ---- .idea/vcs.xml | 6 -- .idea/workspace.xml | 197 -------------------------------------------- 4 files changed, 224 deletions(-) delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index adef0fb..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 5e70234..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C:\Users\subtle moon\AppData\Roaming\Subversion - - - - - 1678892387293 - - - 1678892550428 - - - 1678896264106 - - - 1678899023878 - - - 1678899528345 - - - 1679837922502 - - - - - - - - - - - - - - - \ No newline at end of file From b010f89689cc84e85c55b158184de2a493950f0e Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 22:55:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=9A=8F=E4=BE=BF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E7=82=B9=E4=B8=9C=E8=A5=BF=EF=BC=8C=E8=AF=95=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E5=BF=BD=E7=95=A5.idea=E6=96=87=E4=BB=B6=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E4=BA=86=E6=B2=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/entities/indentItem.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/entities/indentItem.java b/src/main/java/entities/indentItem.java index d8f1dce..023c38f 100644 --- a/src/main/java/entities/indentItem.java +++ b/src/main/java/entities/indentItem.java @@ -10,5 +10,4 @@ public class indentItem { private Float discount;//折扣 private Float finalPrice;//最终价格 private String description;//菜品描述 - } \ No newline at end of file From e74fb7da1a967c37d62e6793ddaa01daa02a8def Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 23:02:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 05d692e..b645f90 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,14 @@ - 删除.idea文件 # 20230326 - 完善实体类 +- 我靠，折腾了一晚上，提交了十几次，终于提交时把.idea这个文件给忽略了 + - 方法：在`.gitgnore`文件中添加 + - `.idea/encodings.xml` + - `.idea/misc.xml` + - `.idea/vcs.xml` + - `.idea/workspace.xml` + - 然后在控制台输入`git rm -r --cached .idea` + - 删除`gitee`或`github`上的`.idea`文件 + - `update`一下远端项目 + - `push`代码 +- 我好菜。。。 \ No newline at end of file