S—434Free
Components / Understated
Merge Conflict Resolver
Resolve git conflict hunks one by one: keep current, incoming or both, preview the merged file, and undo any choice.
diffcode-reviewconflict+3
Components / Understated
Resolve git conflict hunks one by one: keep current, incoming or both, preview the merged file, and undo any choice.