ParentFull threadrusselluresti·I've wanted a tool like this for conflicts - I want to see what people look like when they do a pull and get a conflict.View on HN