vscode resolve conflicts

Click the icon to the left of the big right-click the third page of the conflict - "stash Changes Entry Description

Click on the left side of the last GitLens large icon 

Locate the file under REPOSITORIES - "Stashes -" to change the page to find the store folder       On dev: ..... Description Remarks Before hover ( import icon Apply Stashed Changes) Click - "Yes or Yes, delete after applying (deleted there is a current cached page Stashes file)

 

Guess you like

Origin www.cnblogs.com/wssdx/p/11122473.html