Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: Move-delete merge conflict is not displayed using git ls-files --unmerged

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:49

Possibly related (same subject, not in this thread)

"Constantine Plotnikov" [off-list ref] writes:
I think that if git merge reports the conflicts, such conflicts should
be discoverable using git ls-files and prevent commit with resolving
the conflict like it is done with modify-delete conflicts.
Yeah, I think so, too.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help