[p4] Merge inserts code blocks twice - tr...@treysoft.com - com.perforce.perforce-user

3 messages in com.perforce.perforce-user[p4] Merge inserts code blocks twice

From	Sent On	Attachments
John Griffin	18 Aug 2000 06:34
tr...@treysoft.com	18 Aug 2000 07:26
Heather Van Steenburgh	21 Aug 2000 08:38

Subject:	[p4] Merge inserts code blocks twice
From:	tr...@treysoft.com (tr...@treysoft.com)
Date:	08/18/2000 07:26:48 AM
List:	com.perforce.perforce-user

On Fri, Aug 18, 2000 at 09:34:43AM -0400, John Griffin wrote:

Hi all, my users are complaining that when they are merging files through Perforce that occasionally a code change gets inserted twice into the merged file. So, I have two questions; 1) has anyone else had this problem before? And 2) What did you do to fix it?

I've never seen this problem, but my only experience with p4 comes under BeOS. What platforms and merge-tools do you use?