I am trying to understand how can I use filemerge to resolve conflicts
but with very little documentation I have had no luck. If user A and
user B gets code from Subversion and user a commits the change and
then user B commits the change we run into out of date issue.
Sometime when I update this
Are we allowed to give more than +1? :-)
This is definitely my number one feature request. Ahead of even being
able to see all of a checkin comment, and copying checkin comments to
the Clipboard.
--~--~-~--~~~---~--~~
You received this message because you are subs
It would be nice if Versions fired up a 3-waymerge automatically on
conflicts, which FileMerge supports. Alas, it doesn't so you'll have
to do it manually:
in FileMerge, bring up the Compare Files dialog (cmd-O). Resize this
dialog using the lower right resize thumb to make it taller. This
should
I wrote up some directions with screenshots on how to use Filemerge
here:
http://daveyshafik.com/archives/681-resolving-svn-conflicts-with-filemergeapp-on-os-x.html
- Davey
On Aug 13, 2009, at 06:11 PM, Appfire wrote:
>
> I am trying to understand how can I use filemerge to resolve conflict
This is cool guys. This is exactly what I was looking for. Wired how
there is a small dot at the bottom of the merge window that shows you
the merged file.
Thanks again.
On Aug 14, 9:07 am, Davey Shafik wrote:
> I wrote up some directions with screenshots on how to use Filemerge
> here:
>
>
Hi!
The number 1 feature that's lacking, well, at least from our
perspective here, is the following :
When you update a project and have directory properties conflict
(e.g : happens especially when you have lots of plugins used as
externals), version doesn't have any form of notice for that.
I
I've never seen SVN produce files with the names you used... I'd
expect to see something like this:
source.php
source.php.mine
source.php.r7
source.php.r8
(As Daniel mentioned, these map nicely to Merge, Left, Ancestor, and
Right, respectively.)
Where did you get the suffixes of ".working"
