Closes #30555 Release Notes: - Changed the project diff to autosave the targeted buffer after resolving a merge conflict.
linkme
inventory