[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Conflict resolution process and issue

From: Greg Irvine <greg.irvine_at_thalesatm.com>
Date: 2004-03-03 01:04:45 CET

We're seeing a problem here that if we have a conflict during an update,
we manually solve the conflict within the source file.
The problem is after doing this the file is showing as unmodified and so
can't be committed.

We also manually remove the 3 files that are created on the conflict
(.r###, .r###, .mine).

What is the conflict resolution process with subclipse?

- Greg
Received on Wed Mar 3 11:04:45 2004

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.