bugArX revision control system - Bugs: bug #10306, 3-way merges

 
 

bug #10306: 3-way merges

Submitted by:  Walter Landry <landry>
Submitted on:  Tue 07 Sep 2004 02:47:55 AM UTC  
 
Severity: 1 - FeatureItem Group: None
Status: NonePrivacy: Public
Assigned to: NoneOpen/Closed: Closed

Add a New Comment(Rich Markup)
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Sat 19 Nov 2005 11:32:56 PM UTC, comment #1:

Implemented in ArX-2.2.4

Walter Landry <landry>
Project Administrator
Tue 07 Sep 2004 02:47:55 AM UTC, original submission:

Make merge use a three-way algorithm by default, instead of the current blind application of patches. This will catch the situation where a patch is applied in two branches.

Walter Landry <landry>
Project Administrator

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.

 

Please enter the title of George Orwell's famous dystopian book (it's a date):

 

 

Follows 1 latest change.

Date Changed By Updated Field Previous Value => Replaced By
Sat 19 Nov 2005 11:32:56 PM UTClandryOpen/ClosedOpen=>Closed

Back to the top


Powered by Savane 3.1-cleanup1