{"thread":{"id":"44764","subject":"git blame while resolving merge conflicts","startedAt":"2016-12-25T08:50:45Z","lastAt":"2016-12-25T08:50:45Z","messageCount":1,"participants":["Salil Surendran"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"308325","messageId":"CACbPg6=_VPAJao2XAW+Hkb8_jYQTT3vzeS+eNAUJQRtSA-+EvQ@mail.gmail.com","threadId":"44764","inReplyTo":null,"subject":"git blame while resolving merge conflicts","fromName":"Salil Surendran","fromEmail":"salilsurendran@gmail.com","sentAt":"2016-12-25T08:44:53Z","receivedAt":"2016-12-25T08:50:45Z","isPatch":false,"sender":{"key":"salilsurendran@gmail.com","avatar":null},"body":"I often rebase a large open source project and there are merge\nconflicts where I need to figure out who made the change and when it\norder to decide as to which change to take. So generally what I do is\nthat I go to both repos and look at the file and do a git blame. Is\nthere a mergetool that will provide this info during conflict\nresolution. I would like to know who made and this change and when for\neach version. Right now I am using meld.\n\n-- \nThanks,\nSalil\n\"The surest sign that intelligent life exists elsewhere in the\nuniverse is that none of it has tried to contact us.\"\n"}]}