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
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// is just
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
