I have the following workflow. Collaborator pushes to repo to his
I pull and merge to the default branch.
- either there is no conflict.
- or if there is a conflict , a merging tool (in my case meld) pops
up, indicating the conflict(s).
The question is this: Could I force to pop up a merging tool (again say
meld) which just would show me all the changes of the collaborator's
branch, so that I could cherry pick what I like?
Mercurial mailing list