Diff Conflict
Last modified by Vincent Massol on 2024/11/19 16:12
Ecaterina Moraru (Valica)Description
Community Feedback
Conflicts Resolution
- accepting a certain line by clicking on 'Accept' icon
- the line is removed in recent versions
- after accepting the change, the change is marked as accepted (yellow background) but the initial state is preserved (initially deleted mark)
- batch changes (2 lines) are accepted as group
- you can edit the accepted version in order to resolve the conflict
