Auto merge option for save conflict resolution

[melancthon]

In the Visual Code settings, there is a "save conflict resolution" setting with two options: "askUser" and "overwriteFileOnDisk". Could we add a third option for "attemptMerge"? This "attemptMerge" option would attempt to auto merge when changes are in different parts of the file, and only bring up the diffing editor when the merge is unsuccessful.

[bpasero]

This is an interesting idea, but would we leverage Git for merging or write our own merger?

[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!

[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!