| commit | 0c92d48a89dc6645a43b7bbf3bf53d10b64fa81b | |
| author | Alexandra Buzila <abuzila@eclipsesource.com> | |
| Wed, 15 Jul 2015 09:15:33 +0000 (15 11:15 +0200) | ||
| committer | Philip Langer <planger@eclipsesource.com> | |
| Thu, 30 Jul 2015 16:07:17 +0000 (30 18:07 +0200) | ||
| tree | 3c446c7380ef97d6c24f35a3842cbee9e6a184f6 | treesnapshot (tar.gz zip) |
| parent | 1576a85368b2c406da9ddbb829c433909663d604 | commitdiff |
[470332] Resolving a conflict causes loss of previous changes
A right-to-left merge should be performed when pre-merging the remote
differences in case of a conflicting merge.
Bug: 470332
Change-Id: I07bd0ff1d8012cd992b7d28b64a159040c3d77a9
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>
A right-to-left merge should be performed when pre-merging the remote
differences in case of a conflicting merge.
Bug: 470332
Change-Id: I07bd0ff1d8012cd992b7d28b64a159040c3d77a9
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>