search

abentley / oaf

A Git client that brings a more user-friendly CLI to Git.
Apache License 2.0
9 stars 1 forks source link

Implement LCA merge? #8

Open abentley opened 3 years ago

abentley commented 3 years ago

I still feel it's objectively better, but it's a pile of work.

abentley commented 3 years ago

Maybe start with edge-based merge so that behaviour is more similar to merge3 in its handling of deleted lines?

abentley commented 3 years ago

Maybe uniquify edges only in variable regions?