# git blame while resolving merge conflicts 1 messages from 2016-12-25 to 2016-12-25. Participants: Salil Surendran. Thread: https://gitlist.dev/t/44764 ## Salil Surendran, 2016-12-25 08:44 Subject: git blame while resolving merge conflicts Message-ID: URL: https://gitlist.dev/e/CACbPg6%3D_VPAJao2XAW%2BHkb8_jYQTT3vzeS%2BeNAUJQRtSA-%2BEvQ%40mail.gmail.com ``` I often rebase a large open source project and there are merge conflicts where I need to figure out who made the change and when it order to decide as to which change to take. So generally what I do is that I go to both repos and look at the file and do a git blame. Is there a mergetool that will provide this info during conflict resolution. I would like to know who made and this change and when for each version. Right now I am using meld. -- Thanks, Salil "The surest sign that intelligent life exists elsewhere in the universe is that none of it has tried to contact us." ```