Re: gui client status
From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-07-08 17:37:10 CEST
Martijn Boekhorst <subversion@boekhorst.net> writes:
> One question though, I'd like to do three-way for conflicts - how
When you update and a file becomes "conflicted", two things happen:
1. The working file now contains conflict markers.
The three fulltexts are tracked in the entries file. If you get the
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.