Thread (1 message) 1 message, 1 author, 2016-06-15

Behavior of stash apply vs merge

From: Robin Rosenberg <hidden>
Date: 2016-06-15 22:55:55

Hi,

What good reason is it that 'git stash apply' gives hairy conflict markers, while 'git merge stash' does not. No renames involved.

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