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

Submodule not updated automatically on merge conflict

From: 乙酸鋰 <hidden>
Date: 2016-06-15 22:55:31 

Hi,

If there are merge conflict files, then changed submodules are not
updated automatically.
Why not submodules?
Files do try to merge / update.

Regards,
ch3cooli
Related discussions
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help