Thread (17 messages) 17 messages, 5 authors, 2024-03-25

Re: [PATCH] sequencer: allow disabling conflict advice

From: Phillip Wood <hidden>
Date: 2024-03-04 10:27:33

We already have "advice.resolveConflict" to suppress conflict advice. 
Oh looking more closely that is doing something slightly different - it 
suppresses advice about pre-existing conflicts in the index when 
starting a merge etc. So we probably do need a new config variable but I 
think it should have a generic name - not be sequencer specific so we 
can extend its scope in the future to "git merge", "git am -3", "git 
stash" etc.

Best Wishes

Phillip
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help