When updating, if unresolved conflicts occur, confirm with the user to use default merge-tool to resolve conflicts or abort the update.
When updating, if unresolved conflicts occur, confirm with the user to use default merge-tool to resolve conflicts or abort the update.