wickedest / Mergely

Merge and diff documents online
http://www.mergely.com
Other
1.18k stars 228 forks source link

How to force line-by-line merging? #163

Closed stla closed 2 years ago

stla commented 2 years ago

Hello,

Consider this example:

mergely

If I click one arrow, this replaces the two lines in the other side. Is it normal ? Is there an option, or something to do, to replace lines one-by-one when they are consecutive as in this example?

wickedest commented 2 years ago

@stla, yes, it's normal. the changes are detected line-by-line, and changes are computed using lines. so, these two lines represent one change. the character changes are then computed separately for each line. the merge methods only work on changes, not lines. there currently isn't a way to do what you suggest - Mergely doesn't expose the "changes" so you can't really operate on them independently.

stla commented 2 years ago

Ok, thank you!