Re: Tree conflict question - diff
On Thu, Jul 26, 2012 at 11:04:33AM +0200, Kiren Pillay wrote:
> I'm trying to merge my trunk into my feature branch. I'm coming up with a
> lot of expected tree conflicts (shown below).
> Is there an quick/shorthand way to diff this to see the differences between
> the copies?
> > local add, incoming add upon merge
Try a 2-URL diff. See 'svn help diff', synopsis 3:
3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]
If you're inside a working copy you can use the ^/ shortcut to save
some typing: svn diff ^/trunk/myfile ^/branches/mybranch/myfile
The ^/ expands to the repository root URL as shown by 'svn info'.
Received on 2012-07-26 15:37:02 CEST
This is an archived mail posted to the Subversion Users