* git blame while resolving merge conflicts
@ 2016-12-25 8:44 Salil Surendran
0 siblings, 0 replies; only message in thread
From: Salil Surendran @ 2016-12-25 8:44 UTC (permalink / raw)
To: git
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."
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-12-25 8:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-25 8:44 git blame while resolving merge conflicts Salil Surendran
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.