2 Commits
36379a29c2
...
10000d1d19
| Author | SHA1 | Message | Date |
|---|---|---|---|
WangYang
|
10000d1d19 |
11.12
|
2 months ago |
|
WangYang
|
f9e7cb8445 |
11.12
|
2 months ago |
12 changed files with 79 additions and 465 deletions
-
4.idea/shelf/_2025_11_4_18_29____.xml
-
4.idea/shelf/_2025_11_5_16_53____.xml
-
4.idea/shelf/_2025_11_5_17_05____.xml
-
4.idea/shelf/___1.xml
-
4.idea/shelf/___2.xml
-
134.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
-
63.idea/shelf/在变基之前未提交的更改_[更改]1/shelved.patch
-
63.idea/shelf/在进行更新之前于_2025_11_5_17_05_取消提交了更改_[更改]/shelved.patch
-
80.idea/shelf/在进行签出之前于_2025_11_4_18_29_取消提交了更改_[更改]/shelved.patch
-
80.idea/shelf/在进行签出之前于_2025_11_5_16_53_取消提交了更改_[更改]/shelved.patch
-
60.idea/workspace.xml
-
44王洋学习笔记/11.12.txt
@ -1,4 +0,0 @@ |
|||
<changelist name="在进行签出之前于_2025_11_4_18_29_取消提交了更改_[更改]" date="1762252230252" recycled="true" deleted="true"> |
|||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_11_4_18_29_取消提交了更改_[更改]/shelved.patch" /> |
|||
<option name="DESCRIPTION" value="在进行签出之前于 2025/11/4 18:29 取消提交了更改 [更改]" /> |
|||
</changelist> |
|||
@ -1,4 +0,0 @@ |
|||
<changelist name="在进行签出之前于_2025_11_5_16_53_取消提交了更改_[更改]" date="1762332821806" recycled="true" deleted="true"> |
|||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_11_5_16_53_取消提交了更改_[更改]/shelved.patch" /> |
|||
<option name="DESCRIPTION" value="在进行签出之前于 2025/11/5 16:53 取消提交了更改 [更改]" /> |
|||
</changelist> |
|||
@ -1,4 +0,0 @@ |
|||
<changelist name="在进行更新之前于_2025_11_5_17_05_取消提交了更改_[更改]" date="1762333549002" recycled="true" deleted="true"> |
|||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_11_5_17_05_取消提交了更改_[更改]/shelved.patch" /> |
|||
<option name="DESCRIPTION" value="在进行更新之前于 2025/11/5 17:05 取消提交了更改 [更改]" /> |
|||
</changelist> |
|||
@ -1,4 +0,0 @@ |
|||
<changelist name="在变基之前未提交的更改_[更改]1" date="1762333474424" recycled="true" deleted="true"> |
|||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在变基之前未提交的更改_[更改]1/shelved.patch" /> |
|||
<option name="DESCRIPTION" value="在变基之前未提交的更改 [更改]" /> |
|||
</changelist> |
|||
@ -1,4 +0,0 @@ |
|||
<changelist name="在变基之前未提交的更改_[更改]2" date="1761983106869" recycled="true" deleted="true"> |
|||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch" /> |
|||
<option name="DESCRIPTION" value="在变基之前未提交的更改 [更改]" /> |
|||
</changelist> |
|||
134
.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
@ -1,63 +0,0 @@ |
|||
Index: .idea/workspace.xml
|
|||
IDEA additional info: |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP |
|||
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1250a154-aa13-4278-9e87-904a86c4dbd2\" name=\"更改\" comment=\"11.1\" />\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n <map>\r\n <entry key=\"$PROJECT_DIR$\" value=\"sunweining/feature-20251028175924-学习\" />\r\n </map>\r\n </option>\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"git-widget-placeholder\": \"dev\",\r\n \"last_opened_file_path\": \"D:/study_dbqb/Dbqb_Study/孙维宁学习笔记\",\r\n \"node.js.selected.package.tslint\": \"(autodetect)\"\r\n }\r\n}]]></component>\r\n <component name=\"TaskManager\">\r\n <task id=\"LOCAL-00001\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983013107</created>\r\n <option name=\"number\" value=\"00001\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00001\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983013107</updated>\r\n </task>\r\n <task id=\"LOCAL-00002\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983018907</created>\r\n <option name=\"number\" value=\"00002\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00002\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983018907</updated>\r\n </task>\r\n <option name=\"localTasksCounter\" value=\"3\" />\r\n <servers />\r\n </component>\r\n <component name=\"VcsManagerConfiguration\">\r\n <MESSAGE value=\"11.1\" />\r\n <option name=\"LAST_COMMIT_MESSAGE\" value=\"11.1\" />\r\n </component>\r\n</project> |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP |
|||
<+>UTF-8 |
|||
===================================================================
|
|||
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
|
|||
--- a/.idea/workspace.xml (revision f366c0480cf623186a778468de70c0443ae1d471)
|
|||
+++ b/.idea/workspace.xml (date 1762333349191)
|
|||
@@ -4,7 +4,7 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" /> |
|||
</component> |
|||
<component name="ChangeListManager"> |
|||
- <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="11.1" />
|
|||
+ <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="11.5" />
|
|||
<option name="SHOW_DIALOG" value="false" /> |
|||
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|||
@@ -18,13 +18,13 @@
|
|||
</option> |
|||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
|||
</component> |
|||
- <component name="PropertiesComponent"><![CDATA[{
|
|||
- "keyToString": {
|
|||
- "git-widget-placeholder": "dev",
|
|||
- "last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记",
|
|||
- "node.js.selected.package.tslint": "(autodetect)"
|
|||
+ <component name="PropertiesComponent">{
|
|||
+ "keyToString": {
|
|||
+ "git-widget-placeholder": "dev",
|
|||
+ "last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记",
|
|||
+ "node.js.selected.package.tslint": "(autodetect)"
|
|||
} |
|||
-}]]></component>
|
|||
+}</component>
|
|||
<component name="TaskManager"> |
|||
<task id="LOCAL-00001" summary="11.1"> |
|||
<option name="closed" value="true" /> |
|||
@@ -42,11 +42,20 @@
|
|||
<option name="project" value="LOCAL" /> |
|||
<updated>1761983018907</updated> |
|||
</task> |
|||
- <option name="localTasksCounter" value="3" />
|
|||
+ <task id="LOCAL-00003" summary="11.5">
|
|||
+ <option name="closed" value="true" />
|
|||
+ <created>1762333284024</created>
|
|||
+ <option name="number" value="00003" />
|
|||
+ <option name="presentableId" value="LOCAL-00003" />
|
|||
+ <option name="project" value="LOCAL" />
|
|||
+ <updated>1762333284024</updated>
|
|||
+ </task>
|
|||
+ <option name="localTasksCounter" value="4" />
|
|||
<servers /> |
|||
</component> |
|||
<component name="VcsManagerConfiguration"> |
|||
<MESSAGE value="11.1" /> |
|||
- <option name="LAST_COMMIT_MESSAGE" value="11.1" />
|
|||
+ <MESSAGE value="11.5" />
|
|||
+ <option name="LAST_COMMIT_MESSAGE" value="11.5" />
|
|||
</component> |
|||
</project> |
|||
\ No newline at end of file |
|||
@ -1,63 +0,0 @@ |
|||
Index: .idea/workspace.xml
|
|||
IDEA additional info: |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP |
|||
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1250a154-aa13-4278-9e87-904a86c4dbd2\" name=\"更改\" comment=\"11.1\" />\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n <map>\r\n <entry key=\"$PROJECT_DIR$\" value=\"sunweining/feature-20251028175924-学习\" />\r\n </map>\r\n </option>\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"git-widget-placeholder\": \"dev\",\r\n \"last_opened_file_path\": \"D:/study_dbqb/Dbqb_Study/孙维宁学习笔记\",\r\n \"node.js.selected.package.tslint\": \"(autodetect)\"\r\n }\r\n}]]></component>\r\n <component name=\"TaskManager\">\r\n <task id=\"LOCAL-00001\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983013107</created>\r\n <option name=\"number\" value=\"00001\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00001\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983013107</updated>\r\n </task>\r\n <task id=\"LOCAL-00002\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983018907</created>\r\n <option name=\"number\" value=\"00002\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00002\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983018907</updated>\r\n </task>\r\n <option name=\"localTasksCounter\" value=\"3\" />\r\n <servers />\r\n </component>\r\n <component name=\"VcsManagerConfiguration\">\r\n <MESSAGE value=\"11.1\" />\r\n <option name=\"LAST_COMMIT_MESSAGE\" value=\"11.1\" />\r\n </component>\r\n</project> |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP |
|||
<+>UTF-8 |
|||
===================================================================
|
|||
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
|
|||
--- a/.idea/workspace.xml (revision 01f816774a0da35f14d27ece486a2a0b59203511)
|
|||
+++ b/.idea/workspace.xml (date 1762333474422)
|
|||
@@ -4,7 +4,7 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" /> |
|||
</component> |
|||
<component name="ChangeListManager"> |
|||
- <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="11.1" />
|
|||
+ <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="11.5" />
|
|||
<option name="SHOW_DIALOG" value="false" /> |
|||
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|||
@@ -18,13 +18,13 @@
|
|||
</option> |
|||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
|||
</component> |
|||
- <component name="PropertiesComponent"><![CDATA[{
|
|||
- "keyToString": {
|
|||
- "git-widget-placeholder": "dev",
|
|||
- "last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记",
|
|||
- "node.js.selected.package.tslint": "(autodetect)"
|
|||
+ <component name="PropertiesComponent">{
|
|||
+ "keyToString": {
|
|||
+ "git-widget-placeholder": "dev",
|
|||
+ "last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记",
|
|||
+ "node.js.selected.package.tslint": "(autodetect)"
|
|||
} |
|||
-}]]></component>
|
|||
+}</component>
|
|||
<component name="TaskManager"> |
|||
<task id="LOCAL-00001" summary="11.1"> |
|||
<option name="closed" value="true" /> |
|||
@@ -42,11 +42,20 @@
|
|||
<option name="project" value="LOCAL" /> |
|||
<updated>1761983018907</updated> |
|||
</task> |
|||
- <option name="localTasksCounter" value="3" />
|
|||
+ <task id="LOCAL-00003" summary="11.5">
|
|||
+ <option name="closed" value="true" />
|
|||
+ <created>1762333284024</created>
|
|||
+ <option name="number" value="00003" />
|
|||
+ <option name="presentableId" value="LOCAL-00003" />
|
|||
+ <option name="project" value="LOCAL" />
|
|||
+ <updated>1762333284024</updated>
|
|||
+ </task>
|
|||
+ <option name="localTasksCounter" value="4" />
|
|||
<servers /> |
|||
</component> |
|||
<component name="VcsManagerConfiguration"> |
|||
<MESSAGE value="11.1" /> |
|||
- <option name="LAST_COMMIT_MESSAGE" value="11.1" />
|
|||
+ <MESSAGE value="11.5" />
|
|||
+ <option name="LAST_COMMIT_MESSAGE" value="11.5" />
|
|||
</component> |
|||
</project> |
|||
\ No newline at end of file |
|||
@ -1,80 +0,0 @@ |
|||
Index: .idea/workspace.xml
|
|||
IDEA additional info: |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP |
|||
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1250a154-aa13-4278-9e87-904a86c4dbd2\" name=\"更改\" comment=\"11.1\" />\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n <map>\r\n <entry key=\"$PROJECT_DIR$\" value=\"sunweining/feature-20251028175924-学习\" />\r\n </map>\r\n </option>\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"git-widget-placeholder\": \"dev\",\r\n \"last_opened_file_path\": \"D:/study_dbqb/Dbqb_Study/孙维宁学习笔记\",\r\n \"node.js.selected.package.tslint\": \"(autodetect)\"\r\n }\r\n}]]></component>\r\n <component name=\"TaskManager\">\r\n <task id=\"LOCAL-00001\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983013107</created>\r\n <option name=\"number\" value=\"00001\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00001\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983013107</updated>\r\n </task>\r\n <task id=\"LOCAL-00002\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983018907</created>\r\n <option name=\"number\" value=\"00002\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00002\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983018907</updated>\r\n </task>\r\n <option name=\"localTasksCounter\" value=\"3\" />\r\n <servers />\r\n </component>\r\n <component name=\"VcsManagerConfiguration\">\r\n <MESSAGE value=\"11.1\" />\r\n <option name=\"LAST_COMMIT_MESSAGE\" value=\"11.1\" />\r\n </component>\r\n</project> |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP |
|||
<+>UTF-8 |
|||
===================================================================
|
|||
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
|
|||
--- a/.idea/workspace.xml (revision 4681e03fcc05c7356d45b7a40efbce419ea0224d)
|
|||
+++ b/.idea/workspace.xml (date 1762252091887)
|
|||
@@ -4,7 +4,9 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" /> |
|||
</component> |
|||
<component name="ChangeListManager"> |
|||
- <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="11.1" />
|
|||
+ <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="">
|
|||
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|||
+ </list>
|
|||
<option name="SHOW_DIALOG" value="false" /> |
|||
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|||
@@ -17,14 +19,36 @@
|
|||
</map> |
|||
</option> |
|||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
|||
+ </component>
|
|||
+ <component name="ProjectColorInfo">{
|
|||
+ "associatedIndex": 8
|
|||
+}</component>
|
|||
+ <component name="ProjectId" id="34xnmxX9oLQyXMGugRDRYXTC0zM" />
|
|||
+ <component name="ProjectViewState">
|
|||
+ <option name="hideEmptyMiddlePackages" value="true" />
|
|||
+ <option name="showLibraryContents" value="true" />
|
|||
</component> |
|||
<component name="PropertiesComponent"><![CDATA[{ |
|||
"keyToString": { |
|||
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|||
+ "RunOnceActivity.git.unshallow": "true",
|
|||
"git-widget-placeholder": "dev", |
|||
"last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记", |
|||
- "node.js.selected.package.tslint": "(autodetect)"
|
|||
+ "node.js.detected.package.eslint": "true",
|
|||
+ "node.js.selected.package.eslint": "(autodetect)",
|
|||
+ "node.js.selected.package.tslint": "(autodetect)",
|
|||
+ "nodejs_package_manager_path": "npm",
|
|||
+ "vue.rearranger.settings.migration": "true"
|
|||
} |
|||
}]]></component> |
|||
+ <component name="SharedIndexes">
|
|||
+ <attachedChunks>
|
|||
+ <set>
|
|||
+ <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.26927.53" />
|
|||
+ <option value="bundled-js-predefined-d6986cc7102b-09060db00ec0-JavaScript-IU-251.26927.53" />
|
|||
+ </set>
|
|||
+ </attachedChunks>
|
|||
+ </component>
|
|||
<component name="TaskManager"> |
|||
<task id="LOCAL-00001" summary="11.1"> |
|||
<option name="closed" value="true" /> |
|||
@@ -41,9 +65,20 @@
|
|||
<option name="presentableId" value="LOCAL-00002" /> |
|||
<option name="project" value="LOCAL" /> |
|||
<updated>1761983018907</updated> |
|||
+ </task>
|
|||
+ <task active="true" id="Default" summary="默认任务">
|
|||
+ <changelist id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="" />
|
|||
+ <created>1762217324956</created>
|
|||
+ <option name="number" value="Default" />
|
|||
+ <option name="presentableId" value="Default" />
|
|||
+ <updated>1762217324956</updated>
|
|||
+ <workItem from="1762217326802" duration="1129000" />
|
|||
</task> |
|||
<option name="localTasksCounter" value="3" /> |
|||
<servers /> |
|||
+ </component>
|
|||
+ <component name="TypeScriptGeneratedFilesManager">
|
|||
+ <option name="version" value="3" />
|
|||
</component> |
|||
<component name="VcsManagerConfiguration"> |
|||
<MESSAGE value="11.1" /> |
|||
@ -1,80 +0,0 @@ |
|||
Index: .idea/workspace.xml
|
|||
IDEA additional info: |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP |
|||
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"SELECTIVE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1250a154-aa13-4278-9e87-904a86c4dbd2\" name=\"更改\" comment=\"11.1\" />\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\r\n <map>\r\n <entry key=\"$PROJECT_DIR$\" value=\"sunweining/feature-20251028175924-学习\" />\r\n </map>\r\n </option>\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"git-widget-placeholder\": \"dev\",\r\n \"last_opened_file_path\": \"D:/study_dbqb/Dbqb_Study/孙维宁学习笔记\",\r\n \"node.js.selected.package.tslint\": \"(autodetect)\"\r\n }\r\n}]]></component>\r\n <component name=\"TaskManager\">\r\n <task id=\"LOCAL-00001\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983013107</created>\r\n <option name=\"number\" value=\"00001\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00001\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983013107</updated>\r\n </task>\r\n <task id=\"LOCAL-00002\" summary=\"11.1\">\r\n <option name=\"closed\" value=\"true\" />\r\n <created>1761983018907</created>\r\n <option name=\"number\" value=\"00002\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00002\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1761983018907</updated>\r\n </task>\r\n <option name=\"localTasksCounter\" value=\"3\" />\r\n <servers />\r\n </component>\r\n <component name=\"VcsManagerConfiguration\">\r\n <MESSAGE value=\"11.1\" />\r\n <option name=\"LAST_COMMIT_MESSAGE\" value=\"11.1\" />\r\n </component>\r\n</project> |
|||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP |
|||
<+>UTF-8 |
|||
===================================================================
|
|||
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
|
|||
--- a/.idea/workspace.xml (revision 2218bda5d4e6aaf85f33549b9bdb6d17399145da)
|
|||
+++ b/.idea/workspace.xml (date 1762307338233)
|
|||
@@ -4,7 +4,9 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" /> |
|||
</component> |
|||
<component name="ChangeListManager"> |
|||
- <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="11.1" />
|
|||
+ <list default="true" id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="">
|
|||
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|||
+ </list>
|
|||
<option name="SHOW_DIALOG" value="false" /> |
|||
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|||
@@ -17,14 +19,37 @@
|
|||
</map> |
|||
</option> |
|||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
|||
+ </component>
|
|||
+ <component name="ProjectColorInfo"><![CDATA[{
|
|||
+ "customColor": "",
|
|||
+ "associatedIndex": 8
|
|||
+}]]></component>
|
|||
+ <component name="ProjectId" id="352NBgPumT7MynhLqTJumWCzFtR" />
|
|||
+ <component name="ProjectViewState">
|
|||
+ <option name="hideEmptyMiddlePackages" value="true" />
|
|||
+ <option name="showLibraryContents" value="true" />
|
|||
</component> |
|||
<component name="PropertiesComponent"><![CDATA[{ |
|||
"keyToString": { |
|||
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|||
+ "RunOnceActivity.git.unshallow": "true",
|
|||
"git-widget-placeholder": "dev", |
|||
"last_opened_file_path": "D:/study_dbqb/Dbqb_Study/孙维宁学习笔记", |
|||
- "node.js.selected.package.tslint": "(autodetect)"
|
|||
+ "node.js.detected.package.eslint": "true",
|
|||
+ "node.js.selected.package.eslint": "(autodetect)",
|
|||
+ "node.js.selected.package.tslint": "(autodetect)",
|
|||
+ "nodejs_package_manager_path": "npm",
|
|||
+ "vue.rearranger.settings.migration": "true"
|
|||
} |
|||
}]]></component> |
|||
+ <component name="SharedIndexes">
|
|||
+ <attachedChunks>
|
|||
+ <set>
|
|||
+ <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.26927.53" />
|
|||
+ <option value="bundled-js-predefined-d6986cc7102b-09060db00ec0-JavaScript-IU-251.26927.53" />
|
|||
+ </set>
|
|||
+ </attachedChunks>
|
|||
+ </component>
|
|||
<component name="TaskManager"> |
|||
<task id="LOCAL-00001" summary="11.1"> |
|||
<option name="closed" value="true" /> |
|||
@@ -42,8 +67,19 @@
|
|||
<option name="project" value="LOCAL" /> |
|||
<updated>1761983018907</updated> |
|||
</task> |
|||
+ <task active="true" id="Default" summary="默认任务">
|
|||
+ <changelist id="1250a154-aa13-4278-9e87-904a86c4dbd2" name="更改" comment="" />
|
|||
+ <created>1762304073766</created>
|
|||
+ <option name="number" value="Default" />
|
|||
+ <option name="presentableId" value="Default" />
|
|||
+ <updated>1762304073766</updated>
|
|||
+ <workItem from="1762304075529" duration="636000" />
|
|||
+ </task>
|
|||
<option name="localTasksCounter" value="3" /> |
|||
<servers /> |
|||
+ </component>
|
|||
+ <component name="TypeScriptGeneratedFilesManager">
|
|||
+ <option name="version" value="3" />
|
|||
</component> |
|||
<component name="VcsManagerConfiguration"> |
|||
<MESSAGE value="11.1" /> |
|||
@ -0,0 +1,44 @@ |
|||
11.12 Git学习 |
|||
|
|||
1.初始化设置： |
|||
（1）配置用户名：git config --global user.name “Your Name” |
|||
（2）配置邮箱：git config --global user.email “Your Email” |
|||
（3）存储配置：git config --global credential.helper store |
|||
2.创建仓库： |
|||
（1）创建一个新的本地仓库（省略project-name则在当前目录创建）：git init <project-name> |
|||
（2）克隆一个远程仓库：git clone <url> |
|||
3.四个区域 |
|||
（1）工作区(Working Directory)：就是你在电脑里能实际看到的目录 |
|||
（2）暂存区(Stage/Index)：暂存区也叫索引，用来临时存放未提交的内容，一般在.git目录下的index中 |
|||
（3）本地仓库(Repository)：Git在本地的版本库，仓库信息存储在.git这个隐藏目录中 |
|||
（4）远程仓库(Remote Repository)：托管在远程服务器上的仓库，常用的有GitHub、GitLab、Gitee |
|||
4.文件状态 |
|||
（1）已修改(Modified)：修改了但是没有保存到暂存区的文件 |
|||
（2）已暂存(Staged)：修改后已经保存到暂存区的文件 |
|||
（3）已提交(Committed)：把暂存区的文件提交到本地仓库后的状态 |
|||
|
|||
5.文件状态 |
|||
（1）默认主分支：main/master |
|||
（2）默认远程仓库：origin |
|||
（3）指向当前分支的指针：HEAD |
|||
（4）上一个版本：HEAD^ |
|||
（5）上四个版本：HEAD~ |
|||
6.特殊文件 |
|||
（1）.git Git仓库的元数据和对象数据库 |
|||
（2）.gitignore 忽略文件，不需要提交到仓库的文件 |
|||
7.添加和提交 |
|||
（1）添加一个文件到暂存区：git add <file> |
|||
添加所有文件到暂存区：git add . |
|||
（2）提交所有暂存区的文件到本地仓库：git commit -m “message” |
|||
（3）提交所有已修改的文件到本地仓库：git commit -am “message” |
|||
8.撤销和恢复 |
|||
（1）移动一个文件到新的位置：git mv <file> <new-file> |
|||
（2）从工作区和暂存区删除一个文件，并且将这次删除放入暂存区：git rm <file> |
|||
（3）从索引/暂存区中删除文件，但是本地工作区文件还在，只是不希望这个文件被版本控制：git rm --cached <file> |
|||
11111 |
|||
|
|||
9.查看状态或差异 |
|||
（1）查看仓库状态，列出还未提交的新的或修改的文件：git status |
|||
（2）查看提交历史，--oneline表示简介模式： git log --oneline |
|||
（3）查看未暂存的文件更新了哪些部分：git diff |
|||
（4）查看两个提交之间的差异：git diff <commit-id> <commit-id> |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue