--- title: Expose ancestor path in Conflicts RPC merge_request: 2672 author: type: changed