225 lines
8.8 KiB
XML
225 lines
8.8 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="15b383c4-1dcb-41fd-bb4d-81053e592683" name="Changes" comment="moremore" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
<map>
|
|
<entry key="$PROJECT_DIR$" value="f3" />
|
|
</map>
|
|
</option>
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
<option name="UPDATE_TYPE" value="REBASE" />
|
|
</component>
|
|
<component name="MarkdownSettingsMigration">
|
|
<option name="stateVersion" value="1" />
|
|
</component>
|
|
<component name="ProjectId" id="2BfZywrDEhG6mPUDaSJ6SPXnJiq" />
|
|
<component name="ProjectViewState">
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
<option name="showLibraryContents" value="true" />
|
|
</component>
|
|
<component name="PropertiesComponent"><![CDATA[{
|
|
"keyToString": {
|
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
"WebServerToolWindowFactoryState": "true",
|
|
"last_opened_file_path": "D:/Liao/Documents/CodeGo/CodeRepo/studyRepo",
|
|
"nodejs_package_manager_path": "npm"
|
|
}
|
|
}]]></component>
|
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
<component name="TaskManager">
|
|
<task active="true" id="Default" summary="Default task">
|
|
<changelist id="15b383c4-1dcb-41fd-bb4d-81053e592683" name="Changes" comment="" />
|
|
<created>1657299357940</created>
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1657299357940</updated>
|
|
<workItem from="1657299360064" duration="3365000" />
|
|
</task>
|
|
<task id="LOCAL-00001" summary="master a">
|
|
<created>1657299403390</created>
|
|
<option name="number" value="00001" />
|
|
<option name="presentableId" value="LOCAL-00001" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657299403390</updated>
|
|
</task>
|
|
<task id="LOCAL-00002" summary="master b">
|
|
<created>1657299476942</created>
|
|
<option name="number" value="00002" />
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657299476942</updated>
|
|
</task>
|
|
<task id="LOCAL-00003" summary="dev c">
|
|
<created>1657299532808</created>
|
|
<option name="number" value="00003" />
|
|
<option name="presentableId" value="LOCAL-00003" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657299532808</updated>
|
|
</task>
|
|
<task id="LOCAL-00004" summary="dev d">
|
|
<created>1657299591081</created>
|
|
<option name="number" value="00004" />
|
|
<option name="presentableId" value="LOCAL-00004" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657299591081</updated>
|
|
</task>
|
|
<task id="LOCAL-00005" summary="master bb after dev d">
|
|
<created>1657299641793</created>
|
|
<option name="number" value="00005" />
|
|
<option name="presentableId" value="LOCAL-00005" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657299641793</updated>
|
|
</task>
|
|
<task id="LOCAL-00006" summary="dev d after master bb">
|
|
<created>1657299699918</created>
|
|
<option name="number" value="00006" />
|
|
<option name="presentableId" value="LOCAL-00006" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657299699918</updated>
|
|
</task>
|
|
<task id="LOCAL-00007" summary="git rebase ,解决冲突">
|
|
<created>1657300663991</created>
|
|
<option name="number" value="00007" />
|
|
<option name="presentableId" value="LOCAL-00007" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657300663991</updated>
|
|
</task>
|
|
<task id="LOCAL-00008" summary="new branch">
|
|
<created>1657300997041</created>
|
|
<option name="number" value="00008" />
|
|
<option name="presentableId" value="LOCAL-00008" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657300997041</updated>
|
|
</task>
|
|
<task id="LOCAL-00009" summary="中期更新master">
|
|
<created>1657301127596</created>
|
|
<option name="number" value="00009" />
|
|
<option name="presentableId" value="LOCAL-00009" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657301127596</updated>
|
|
</task>
|
|
<task id="LOCAL-00010" summary="before rebase">
|
|
<created>1657301202548</created>
|
|
<option name="number" value="00010" />
|
|
<option name="presentableId" value="LOCAL-00010" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657301202548</updated>
|
|
</task>
|
|
<task id="LOCAL-00011" summary="f2 new">
|
|
<created>1657301560663</created>
|
|
<option name="number" value="00011" />
|
|
<option name="presentableId" value="LOCAL-00011" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657301560663</updated>
|
|
</task>
|
|
<task id="LOCAL-00012" summary="f2 2">
|
|
<created>1657301592639</created>
|
|
<option name="number" value="00012" />
|
|
<option name="presentableId" value="LOCAL-00012" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657301592639</updated>
|
|
</task>
|
|
<task id="LOCAL-00013" summary="master ---">
|
|
<created>1657301628900</created>
|
|
<option name="number" value="00013" />
|
|
<option name="presentableId" value="LOCAL-00013" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657301628900</updated>
|
|
</task>
|
|
<task id="LOCAL-00014" summary="f2 done">
|
|
<created>1657301656750</created>
|
|
<option name="number" value="00014" />
|
|
<option name="presentableId" value="LOCAL-00014" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657301656750</updated>
|
|
</task>
|
|
<task id="LOCAL-00015" summary="f2 2nd">
|
|
<created>1657301867406</created>
|
|
<option name="number" value="00015" />
|
|
<option name="presentableId" value="LOCAL-00015" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657301867406</updated>
|
|
</task>
|
|
<task id="LOCAL-00016" summary="f3">
|
|
<created>1657302016380</created>
|
|
<option name="number" value="00016" />
|
|
<option name="presentableId" value="LOCAL-00016" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657302016380</updated>
|
|
</task>
|
|
<task id="LOCAL-00017" summary="m">
|
|
<created>1657302039256</created>
|
|
<option name="number" value="00017" />
|
|
<option name="presentableId" value="LOCAL-00017" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657302039256</updated>
|
|
</task>
|
|
<task id="LOCAL-00018" summary="m">
|
|
<created>1657302063879</created>
|
|
<option name="number" value="00018" />
|
|
<option name="presentableId" value="LOCAL-00018" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657302063879</updated>
|
|
</task>
|
|
<task id="LOCAL-00019" summary="more">
|
|
<created>1657302156854</created>
|
|
<option name="number" value="00019" />
|
|
<option name="presentableId" value="LOCAL-00019" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657302156854</updated>
|
|
</task>
|
|
<task id="LOCAL-00020" summary="moremore">
|
|
<created>1657302296021</created>
|
|
<option name="number" value="00020" />
|
|
<option name="presentableId" value="LOCAL-00020" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1657302296021</updated>
|
|
</task>
|
|
<option name="localTasksCounter" value="21" />
|
|
<servers />
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<option name="version" value="3" />
|
|
</component>
|
|
<component name="Vcs.Log.Tabs.Properties">
|
|
<option name="TAB_STATES">
|
|
<map>
|
|
<entry key="MAIN">
|
|
<value>
|
|
<State />
|
|
</value>
|
|
</entry>
|
|
</map>
|
|
</option>
|
|
</component>
|
|
<component name="VcsManagerConfiguration">
|
|
<MESSAGE value="master a" />
|
|
<MESSAGE value="master b" />
|
|
<MESSAGE value="dev c" />
|
|
<MESSAGE value="dev d" />
|
|
<MESSAGE value="master bb after dev d" />
|
|
<MESSAGE value="dev d after master bb" />
|
|
<MESSAGE value="git rebase ,解决冲突" />
|
|
<MESSAGE value="new branch" />
|
|
<MESSAGE value="中期更新master" />
|
|
<MESSAGE value="before rebase" />
|
|
<MESSAGE value="f2 new" />
|
|
<MESSAGE value="f2 2" />
|
|
<MESSAGE value="master ---" />
|
|
<MESSAGE value="f2 done" />
|
|
<MESSAGE value="f2 2nd" />
|
|
<MESSAGE value="f3" />
|
|
<MESSAGE value="m" />
|
|
<MESSAGE value="more" />
|
|
<MESSAGE value="moremore" />
|
|
<option name="LAST_COMMIT_MESSAGE" value="moremore" />
|
|
</component>
|
|
</project> |