> On Mon, 2011-04-04 at 10:26 -0400, Bob Archer wrote:
> > > I read the SVN book, as there are three type conflicts: text,
> > > tree and
> > > properties conflict. However, I wanna know why it is a
> conflict.
> > > For
> > > example, if there is a text conflict when I do merging code, I
> just
On Mon, 2011-04-04 at 10:26 -0400, Bob Archer wrote:
> > I read the SVN book, as there are three type conflicts: text,
> > tree and
> > properties conflict. However, I wanna know why it is a conflict.
> > For
> > example, if there is a text conflict when I do merging code, I just
> > know
> > the
> I read the SVN book, as there are three type conflicts: text,
> tree and
> properties conflict. However, I wanna know why it is a conflict.
> For
> example, if there is a text conflict when I do merging code, I just
> know
> there is an conflict but don't know why it is a conflict.
It is a con
