Issue #3621777: Handle a conflict between a generated file and a hand edit

Sergey Drakrequested to merge
issue/myrest-3621777:3621777-handle-a-conflict into 1.0.x

Closes #3621777

Merge request reports