RIA-83, RIA-82 Added support for "recursive" strategy and confirmation dial…

SmartBear / ready-git-plugin

The Git Integration plugin for ReadyAPI

8 stars 3 forks source link

RIA-83, RIA-82 Added support for "recursive" strategy and confirmation dial… #13

Closed Alexander-Paeshin closed 7 years ago

Alexander-Paeshin commented 7 years ago

…og for merging if conflicts were found. https://smartbear.atlassian.net/browse/RIA-83 https://smartbear.atlassian.net/browse/RIA-82

IlyaAvdeev commented 7 years ago

@andersjaensson could you look at this PR?

andersjaensson commented 7 years ago

If I understand things correctly, this will try to merge even if the same file has changed? While that would be nice I think it could potentially cause a lot of problems. I thought we should start by trying to merge files that were changed only on "one side" and still do the OURS/THEIRS for the rest.

Anyways, both approaches have their problems and I think this is an improvement over how it is today.