Smart (stage before) pull support

[Kingwl]

As #97525. We have 'force' and 'smart' checkout.
I think it's better to support too when we git pull and has some unstaged changes in workspace .

[vscode-triage-bot]

This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our documentation.

Happy Coding!

[eamodio]

You can enable this behavior today in git, by setting merge.autoStash or rebase.autoStash in your git config.

If we were to add this explicitly to git pull we should use the --autoStash option to provide the behavior, rather than implementing it ourselves.

I also, related to #97525 I think we should adopt --discard-changes for force, and maybe also use --merge for smart (although --merge would probably have a slightly different behavior in the case where the stash pop fails).

[vscode-triage-bot]

This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our documentation.

Happy Coding!

[vscode-triage-bot]

🙁 In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our documentation.

Happy Coding!