Skip to main content
summaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict
AgeCommit message (Expand)AuthorFilesLines
2013-10-18[406402] - Fix conflicts are created after merging and savingAxel Richard1-3/+3
2013-06-21Filling of the implication link with UML subsets.Cedric Notot1-54/+6
2013-05-24Avoid nesting iterables/iterators with concat when possibleLaurent Goubet1-31/+1
2013-04-18[381143] Do not nest containment deletion conflicts.Laurent Goubet1-9/+215
2013-01-21[381143] Conflict detection issueLaurent Goubet1-2/+2
2013-01-04Resource attachment completion.Laurent Goubet1-15/+70
2012-11-08Conflict detection for resource attachment changesLaurent Goubet1-0/+73
2012-10-15add Monitor to all computing methods.Mikaël Barbero2-25/+6
2012-10-12Merge branch 'master' into api_embellishmentMikaël Barbero1-3/+4
2012-10-11NEW - bug 389810: Dynamic instance match fails cbrun1-3/+4
2012-10-04API embellishmentMikaël Barbero1-12/+31
2012-09-18bug fixesCedric Notot1-4/+12
2012-09-09Conflict detection failure : we failed to see that a conflict was inlgoubet1-9/+68
2012-08-31Some more unit tests for the out-of-scope values merging.lgoubet1-6/+1
2012-08-03add a EMFCompareConfiguration class to configure the match/diff/mergeMikaël Barbero1-10/+1
2012-07-20Making these static to avoid keeping references to the containing class.lgoubet1-1/+1
2012-07-20The parameter passed on to the predicate's apply method can be null.lgoubet1-4/+6
2012-06-15Add merge support for Attribute changes.lgoubet1-1/+4
2012-06-08Avoid needless recursion and list creations.lgoubet1-0/+22
2012-06-01A few APIs changes :cbrun1-9/+24
2012-05-21Commentinglgoubet1-64/+31
2012-05-21Adding the missing conflict unit tests.lgoubet1-83/+259
2012-05-16Fixing conflict detection for the remaining use cases.lgoubet1-13/+27
2012-05-11Improving a little more the conflict detection.lgoubet1-21/+72
2012-05-11Fixing detection of some yet undetected diffs.lgoubet1-0/+59
2012-05-10Conflict detection for all single-valued features is now functional and tested.lgoubet1-2/+19
2012-05-10Adding the concept of pseudo-conflicts to the metamodel.lgoubet1-7/+15
2012-05-10We now detect changes for "identical deletions" on each side.lgoubet1-14/+277
2012-05-03Commiting all of the models corresponding to the conflict use cases.lgoubet1-35/+67
2012-04-24Drafting the API of the conflict detection processlgoubet2-0/+78

    Back to the top