feat: add merge-resolver mode for intelligent conflict resolution#6090

mrubens merged 1 commit intomainRooCodeInc/Roo-Code:mainfrom

feat/merge-resolver-modeRooCodeInc/Roo-Code:feat/merge-resolver-modeCopy head branch name to clipboard