Failed to execute the [velocity] macro. Cause: [The execution of the [velocity] script macro is not allowed in [incubator:Improvements.DiffConflict]. Check the rights of its last author or the parameters if it's rendered from another script.]. Click on this message for details.

Community Feedback

Information

[UX][Proposal]

Conflicts Resolution

  • accepting a certain line by clicking on 'Accept' icon
  • the line is removed in recent versions
    step1.png
  • after accepting the change, the change is marked as accepted (yellow background) but the initial state is preserved (initially deleted mark)
    step2.png
  • batch changes (2 lines) are accepted as group
    step3.png
  • you can edit the accepted version in order to resolve the conflict
    step4.png