[squeak-dev] [ANN] MCConflicless

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[squeak-dev] [ANN] MCConflicless

Sebastian Sastre-2
Hi all,

        I've published this package in http://www.squeaksource.com/mc 

Definition: Allows to selectively merge changes which are without conflicts
among different version of one package.

Applicability: To be able to reject non conflictive and poor quality code. An
example can be a tired developer commiting bad parts of code due to distraction
or exhaustion and mergers are able to reject that parts preserving the quality
of the branch and that developer's health and best success :)

Note: if you install UI Enhancements from Gary, this package will also make you
able to use diff tools merger choosing, for each change, which is the winner and
the looser of the merge (which, IMHO, is the most useful tool for that this
days).

Sebastian Sastre, Apr, 2008


Reply | Threaded
Open this post in threaded view
|

Re: [squeak-dev] [ANN] MCConflicless

Lukas Renggli
>  Definition: Allows to selectively merge changes which are without conflicts
>  among different version of one package.

What are the implications on the ancestry information? What about
repeated-selective merges?

Lukas

--
Lukas Renggli
http://www.lukas-renggli.ch