CODEWITHSUNDEEP
gitgit-mergemerge-conflict-resolution
Salil Surendran
Salil Surendran

Reputation: 2335

git blame while resolving merge conflicts

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 in 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.

Upvotes: 13

Views: 2305

Answers (1)

VonC
VonC

Reputation: 1323115

Beside gitk, you can try git blame -L '/^<<<</,/^>>>>/' -- {filename}: this is not integrated to a mergetool, but can be done for all conflicted files first.
Then you launch mergetool.

Upvotes: 17

Related Questions