Sali, Both remote repos will have been copied into your local remote tracking branches (you can't do the merge if this has not happened!). This (the fact you all ready have it all locally) can be a difficult concept to grasp until pushed by a problem like this.
The refs/remotes/<names>/<their_branch_names> is just another part of YOUR refs/namespace/name hierarchy. There are all part of the same big refs/* tree that also hold refs/tags/* and refs/heads/* (this 'heads' namespace is where your personal local branch names hide). So all the "remote" namespace stuff is just a comfort blanket to make sure we/you don't get mixed up between what we wrote ourselves and our copies of what others wrote. All this means you can just run git blame on the refs/remotes/<repo>/<their_branch> namespace just as quickly as you can on your own code - it's all inside your own pc! The other option is to use the 'gitk' viewer, which takes the git log selection options to decide what to display. so 'gitk --all &' or 'gitk -30 &' or 'gitk origin/theirs mine ^master &' are different style I use (the '&', as you will know is so the command line returns terminal control to you rather than waiting for the viewer to be terminated..) Season Greetings Philip ----- Original Message ----- From: Salil Surendran To: Git for human beings Sent: Sunday, December 25, 2016 8:39 AM Subject: [git-users] 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 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. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
