git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git blame while resolving merge conflicts

From
SSSalil Surendran <salilsurendran@gmail.com>
Date
Dec 25, 2016, 08:44 UTC
Message-ID
<CACbPg6=_VPAJao2XAW+Hkb8_jYQTT3vzeS+eNAUJQRtSA-+EvQ@mail.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."
Message 1 of 1 in “git blame while resolving merge conflicts”
  1. Salil SurendranDec 25, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.