On Wed, Aug 18, 2010 at 11:38:28AM +0100, emerson wrote:
> I'm trying to run a merge with different revisions. We use a two tier
> codebase approach with trunk and a stable branch and selectively
> cherry-pick what should be merged.
This is a rather vague description of what you are doing.
If you
I'm trying to run a merge with different revisions. We use a two tier
codebase approach with trunk and a stable branch and selectively
cherry-pick what should be merged.
After merging a few revisions, I have a "Summary of conflicts: Tree
conflicts: 2" message. How can I find out which the revisio
