fac icon indicating copy to clipboard operation
fac copied to clipboard

Published 20 hours ago • verified publisher icon mkchoi212

"Parent of" sticks around after resolving conflict

Open alok opened this issue 5 years ago • 1 comments

The ||||| marker isn't removed when the conflict is resolved and ends up in the codebase.

alok avatar Jul 16 '18 05:07 alok

Sorry for the really late reply but need a sample file where this happens. Thanks!

mkchoi212 avatar Mar 24 '19 18:03 mkchoi212