reset the last commit
^ means go back one stage, if there is ^^, it means go back two stage
if there is too many times, you can write it as commit~3 or commit^3
Different
only HEAD will move
files in both working directory and staging area will be removed
-default
-files in staging area will be removed, but files in working directory will not
sequenceDiagram
participant w as Workspace
participant sa as Staging Area
participant d as Branch develop
participant m as Local Repo
participant r as Remote Repo
participant c as Colleagues
rect
m ->> w: git init
r ->> w: git clone
end
w ->> sa: git add
sa ->> m: git commit
m ->> d: git checkout
d ->> m: git merge
Note over d, m: Merge request
m ->> r: git push
c ->> r: git push
rect
r ->> w: git pull
r ->> m: git fetch
m ->> w: git merge
end
m -) w: git reset --hard
m -) sa: git reset --soft
Note over w, sa: git reset --mixed
1. Create a new git repository and a new file in it.
2. Create two new branches call "test2" and "test3".
3. Switch to other branches, add some text, then commit. When we switch to test2 or test3, we only can see the text from main.
4. After commit two branches, switch back to the main.
5. Start to merge main and test2
6. Then we merge main and test3, but the conflict happen.
7. Fix the conflict manually.
8. After resolve the conflict, remember to add it, commit it, then push it.
9. Now everything is great!!
10.
1. Main branch and origin Markdown file
2. Change content and push to gitlab.
3. Create a new merge request
4. Code reviewer will check the change and commit it if there is problem.
5. After the problem fixed, manager can merge the code.
6. Merge completed.
7.
1. Create the new issue.
2. In the issue page, developer can create the new merge request and fix the problem there.
3. After merge request completed, the issue will close at the same time.
4. Milestone
5. Create the new issue and add description
6. Issue boards
7. Issues and milestone
8. Personal boards
9.
{// employee schema"$schema":"https://json-schema.org/draft/2020-12/schema","$id":"mySchema","title":"Information of Employee","description":"The document records the details of an employee","type":"object","properties":{"id":{"description":"The unique number for an employee","type":"number",},"name":{"description":"The name of the employee","type":"string","minLength":2},"dateOfBirth":{"description":"The date of birth of the employee","type":"string","format":"date"},"hobbies":{"description":"Hobbies of the employee","type":"object","properties":{"indoor":{"type":"array","items":{"description":"List of hobbies","type":"string"},"minItems":1,"uniqueItems":true},"outdoor":{"type":"array","items":{"description":"List of hobbies","type":"string"},"minItems":1,"uniqueItems":true}}},"usedLaptop":{"description":"Which brands of laptops do employees use","OSType":{"type":"string"},"required":["OSType"],"oneOf":[{"properties":{"OSType":{"const":"Windows"}},"$ref":"#/loptop.schema.json"},{"properties":{"OSType":{"const":"OSX"}},"$ref":"#/loptop.schema.json"}]}},"required":["id","name","dateOfBirth","hobbies","usedLaptop"]}// laptop schema --------------------------------------------------{"$schema":"https://json-schema.org/draft/2020-12/schema","$id":"#/laptop.schema.json","type":"object","properties":{"brand":{"type":"string"},"model":{"type":"string"}},"required":["brand","model"]}
*Creates an Observable from an Array, an array-like object, a Promise, an iterable object, or an Observable-like object
from<T>(input: ObservableInput<T>)
*Creates an Observable from listening element
fromEvent<T>(target: any, eventName: string)
*Converts data from source Observable, and emits result as an Observable.
map<T, R>((value: T, index: number) => R)
*Creates an output Observable which concurrently emits all values from every given input Observable
merge(args)
*Converts the arguments to an observable sequence
of<T>(args)
*Emits only the first count values emitted by the source Observable.
take<T>(count: number)
// The module 'vscode' contains the VS Code extensibility API// Import the module and reference it with the alias vscode in your code belowimport*asvscodefrom'vscode';// This method is called when your extension is activated// Your extension is activated the very first time the command is executedexportfunctionactivate(context:vscode.ExtensionContext){// Use the console to output diagnostic information (console.log) and errors (console.error)// This line of code will only be executed once when your extension is activatedconsole.log('Congratulations, your extension "testextension" is now active!');// The command has been defined in the package.json file// Now provide the implementation of the command with registerCommand// The commandId parameter must match the command field in package.jsonletdisposable=vscode.commands.registerCommand('testextension.helloWorld',()=>{// The code you place here will be executed every time your command is executed// Display a message box to the uservscode.window.showInformationMessage('Hello World from testExtension!');});context.subscriptions.push(disposable);}// This method is called when your extension is deactivatedexportfunctiondeactivate(){}
// toggle the panelconstexecCmd=vscode.commands.registerCommand('testextension.executeCommand',async()=>{awaitvscode.commands.executeCommand('workbench.action.togglePanel');vscode.window.showInformationMessage('Panel has been toggle');});// toggle the sidebarconstexecCmd2=vscode.commands.registerCommand('testextension.execCommand',async()=>{awaitvscode.commands.executeCommand('workbench.action.toggleSidebarVisibility');vscode.window.showInformationMessage('Sidebar');});context.subscriptions.push(execCmd,execCmd2);
constcommand='testextension.sayHi';constcommandHandler=(name:string='world')=>{console.log(`Hello ${name}!!!`);vscode.window.showInformationMessage(`Hello ${name}!!!`);};context.subscriptions.push(vscode.commands.registerCommand(command,commandHandler));/* ---------- 我是分隔線 ---------- */letdisposable=vscode.commands.registerCommand('testextension.helloWorld',()=>{vscode.window.showInformationMessage('Hello World from testExtension!');});context.subscription.push(disposable);
// register text editor commandconstregTxtCmd=vscode.commands.registerTextEditorCommand('testextension.textEditorCommand',()=>{vscode.window.showInformationMessage('Show Message Only when there is an active editor')});context.subscription.push(regTxtCmd);
// My context menuconstmenu1=vscode.commands.registerCommand('context-menu.panelVisible',async()=>{awaitvscode.commands.executeCommand('workbench.action.togglePanel');vscode.window.showInformationMessage('Execute command when panel is visible');});constmenu2=vscode.commands.registerCommand('context-menu.panelVisibleAlt',async()=>{awaitvscode.commands.executeCommand('workbench.action.toggleDevTools');vscode.window.showInformationMessage('Execute command when using alternative menu command');});constmenu3=vscode.commands.registerCommand('context-menu.panelInvisible',async()=>{awaitvscode.commands.executeCommand('workbench.action.togglePanel');vscode.window.showInformationMessage('Execute command when panel is invisible');});context.subscriptions.push(menu1,menu2,menu3);
"contributes":{"commands":[{"command":"treeview.helloWorld","title":"Hello World"},{"command":"treeview.registerdataprovider","title":"Resigter Data Provider"}],"views":{"explorer":[{"id":"TreeView","contextualTitle":"TreeViewTitle","name":"TreeView"}]},"viewsWelcome":[{"view":"TreeView","contents":"Welcome to NewTreeView =]\n[Resigter Data Provider](command:treeview.registerdataprovider)"}]}
vscode.window.registerTreeDataProvider('TreeView',newDataProvider());vscode.window.showInformationMessage('Create TreeView!!');/* ----- ----- */classTreeViewItemextendsvscode.TreeItem{constructor(label:string,collapsibleStates?:vscode.TreeItemCollapsibleState){super(label,collapsibleStates);}}classDataProviderimplementsvscode.TreeDataProvider<TreeViewItem>{// Implement this if your tree data can change and your want to update the treeviewonDidChangeTreeData?:vscode.Event<void|TreeViewItem|TreeViewItem[]|null|undefined>|undefined;// Implement this to return the UI representation of the element that gets displayed in the viewgetTreeItem(element:TreeViewItem):vscode.TreeItem|Thenable<vscode.TreeItem>{returnelement;thrownewError('Method not implemented.');}// Implement this to return the children for the given element or root (if no element is passed)getChildren(element?:TreeViewItem|undefined):vscode.ProviderResult<TreeViewItem[]>{returnPromise.resolve([newTreeViewItem('TreeItem-01'),newTreeViewItem('TreeItem-02'),newTreeViewItem('TreeItem-03'),]);thrownewError('Method not implemented.');}getParent?(element:TreeViewItem):vscode.ProviderResult<TreeViewItem>{thrownewError('Method not implemented.');}resolveTreeItem?(item:vscode.TreeItem,element:TreeViewItem,token:vscode.CancellationToken):vscode.ProviderResult<vscode.TreeItem>{thrownewError('Method not implemented.');}}
import*asvscodefrom'vscode';import{DataProvider,TreeViewItem}from'./treeview-data-provider';exportfunctionactivate(context:vscode.ExtensionContext){constdataProvider=newDataProvider();letinitView=vscode.commands.registerCommand('dataprovider.registerDataProvider',()=>{vscode.window.registerTreeDataProvider('treeview',dataProvider);vscode.window.showInformationMessage('Create treeview ∀');});letaddItem=vscode.commands.registerCommand('dataprovider.01_add',async()=>{constitemId=awaitvscode.window.showInputBox({placeHolder:'Your New TreeItem id'})||'';if(itemId!==''){dataProvider.addItem(newTreeViewItem(itemId));}vscode.window.showInformationMessage('Add TreeViewItem ∀');});leteditItem=vscode.commands.registerCommand('dataprovider.02_edit',async(item:TreeViewItem)=>{constitemName=awaitvscode.window.showInputBox({placeHolder:'Your New TreeItem Name'})||'';if(itemName!==''){dataProvider.editItem(item,itemName);};vscode.window.showInformationMessage('Re-name TreeViewItem ∀!');});letdeleteItem=vscode.commands.registerCommand('dataprovider.03_delete',async(item:TreeViewItem)=>{constconfirm=awaitvscode.window.showQuickPick(['delete','canel'],{placeHolder:'Do you want to delete item?'});if(confirm==='delete'){dataProvider.deleteItem(item);}vscode.window.showInformationMessage('Delete TreeViewItem ∀!');});context.subscriptions.push(initView,addItem,editItem,deleteItem);}
import*asvscodefrom'vscode';letoutputchannel:vscode.OutputChannel;exportfunctionactivate(context:vscode.ExtensionContext){outputchannel=vscode.window.createOutputChannel('∀∀∀∀∀');letdisposable=vscode.commands.registerCommand('outputchannel.helloWorld',()=>{outputchannel.show();});context.subscriptions.push(disposable);outputchannel.append('[ Text ]');outputchannel.appendLine('[ value and line ]');outputchannel.append('[ Text 2.0 ]');outputchannel.appendLine('[ value and line 2.0]');}
"contributes":{"configuration":{"title":"myWorkspace","properties":{"myWorkspace.input":{"type":"string","default":"default","description":"provide a input for accepting value"},"myWorkspace.inputNum":{"type":"number","default":"1.011","description":"provide a input for accepting number"},"myWorkspace.inputInt":{"type":"integer","default":"1","markdownDescription":"MarkdownDescription, provide a integer number"},"myWorkspace.inputBoolean":{"type":"boolean","default":"true","description":"click!!"},"myWorkspace.color.inputEnum":{"type":"string","default":"Sapphire blue","enum":["Ruby red","Sapphire blue","Emerald green","Onyx black","Pearl white","Topaz yellow","Amethyst purple"],"enumDescriptions":["0","1","2","3","4","5","6"]}}},"commands":[{"command":"workspace-api.helloWorld","title":"Hello World"},{"command":"myWorkspace.getSettings","title":"get WS"}]}
UNDER CONSTRUCTION 
title
properties
description/ markdownDescription
type
enum/ enumDescriptions/ enumItemLabels
