yaoweiprc bc8aa3889c Support for resolving conflicts when using git-merge [INS-4638] (#8185) ...

* Remove unused codes

* let user resolve conflict when using git merge

* fix code review issue

* Solve the bug that working area does not update after merge.

* modify git smoke test timeout

2024-11-25 16:20:53 +00:00

..

extensions.json

Tailwind (#6189)

2023-08-01 12:04:15 +03:00

launch.json

inso clean up (#7578)

2024-06-24 12:02:22 +02:00

settings.json

Support for resolving conflicts when using git-merge [INS-4638] (#8185)

2024-11-25 16:20:53 +00:00

tasks.json

fix: vscode debug config (#7231)

2024-04-08 09:17:51 +02:00