| commit | 384248566a4dff04966a1e736564d2d871712941 | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Thu Jul 15 11:10:36 2021 +0200 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Fri Jul 16 14:21:06 2021 +0200 |
| tree | 64afc1792681ccbd390c08bc51759b39703e4963 | |
| parent | a8ce42be598ac6b8cc4c4e4d20411c680cbd025a [diff] |
Fix delete-change conflict detection (at file level) Removing a file locally and changing it remotely should be seen as a conflict by EMF Compare, but since we were using the local traversal (empty since the file has been removed) as starting point, we were not able to resolve the remote files either, ending up in an empty comparison because of missing file variants. Change-Id: I279ea3cd3b30fa65cc5a244917685e76d42e0f81