1 2 3
Admin@VISIONPC_DN117 /d/Users/Admin/Documents/Projects/MGraphMatch (spdpmap-new) $ git merge -s ours spdp-map Already up-to-date.